From c095b86c873c4f8f18f63c836a3e91c6dfab66b4 Mon Sep 17 00:00:00 2001 From: Marvin Klar Date: Fri, 3 Jan 2025 17:04:32 +0100 Subject: [PATCH 1/5] Add deployment pipeline --- .github/workflows/deploy.yml | 45 ++++++++++++++++++++++++++++++++++++ .gitignore | 3 +++ pack.mcmeta | 2 +- 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..1d78c76 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,45 @@ +name: Deploy + +on: + release: + types: [created] + +jobs: + deploy: + name: Deploy + runs-on: ubuntu-latest + steps: + - name: Install SSH Key + uses: shimataro/ssh-key-action@v2 + with: + key: ${{ secrets.SSH_PRIVATE_KEY }} + known_hosts: 'just-a-placeholder-so-we-dont-get-errors' + - name: Adding Known Hosts + run: ssh-keyscan -p ${{ secrets.SSH_PORT }} -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts + + - name: Get code + uses: actions/checkout@v2 + + - name: Update version number + run: | + apt update + apt install jq -y + DESCRIPTION="\u00A78Ottonien.com Serverpack v$GITHUB_REF_NAME\n\u00A72Benötigt OptiFine \u00A76[MC 1.20.4]" + jq --arg desc "$DESCRIPTION" '.pack.description = $desc' pack.mcmeta > pack.meta + sed 's/\\\\/\\/g' pack.meta > pack.mcmeta + rm pack.meta + + - name: Create zip file + run: zip -r Ottonien.zip * + + - name: Upload resource pack + uses: actions/upload-artifact@v3 + with: + name: Resourcepack + path: Ottonien.zip + + - name: Deploy to CDN + run: | + rsync -avzh -e "ssh -p ${{ secrets.SSH_PORT }}" Ottonien.zip ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEPLOYMENT_PATH }}/Ottonien.zip + rsync -avzh -e "ssh -p ${{ secrets.SSH_PORT }}" Ottonien.zip ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEPLOYMENT_PATH }}/Ottonien.zip.new + rsync -avzh -e "ssh -p ${{ secrets.SSH_PORT }}" Ottonien.zip ${{ secrets.SSH_USER }}@${{ secrets.SSH_HOST }}:${{ secrets.DEPLOYMENT_PATH }}/resourcepack/Ottonien_Reformed_v$GITHUB_REF_NAME.zip diff --git a/.gitignore b/.gitignore index 1897071..609df76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ # Mac specific ignores **/.DS_Store + +# IntelliJ files +.idea \ No newline at end of file diff --git a/pack.mcmeta b/pack.mcmeta index 6f9a929..a8ecd66 100755 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "pack_format": 22, - "description": "\u00A78Ottonien.com Serverpack\n\u00A72Benötigt Optifine \u00A76[MC 1.20.4]" + "description": "\u00A78Ottonien.com Serverpack\n\u00A72Benötigt OptiFine \u00A76[MC 1.20.4]" } } From c2b49e238aaea98e2fdb18f7048a934776152087 Mon Sep 17 00:00:00 2001 From: Marvin Klar Date: Fri, 3 Jan 2025 17:07:29 +0100 Subject: [PATCH 2/5] Update deployment pipeline --- .github/workflows/deploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1d78c76..d634d6a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -22,8 +22,8 @@ jobs: - name: Update version number run: | - apt update - apt install jq -y + sudo apt-get update + sudo apt-get install jq -y DESCRIPTION="\u00A78Ottonien.com Serverpack v$GITHUB_REF_NAME\n\u00A72Benötigt OptiFine \u00A76[MC 1.20.4]" jq --arg desc "$DESCRIPTION" '.pack.description = $desc' pack.mcmeta > pack.meta sed 's/\\\\/\\/g' pack.meta > pack.mcmeta From 445b37335dc5b32277ffa469bb982e677534a45d Mon Sep 17 00:00:00 2001 From: Marvin Klar Date: Fri, 3 Jan 2025 17:20:00 +0100 Subject: [PATCH 3/5] Update deployment pipeline --- .github/workflows/deploy.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d634d6a..e5b8a68 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,11 +32,20 @@ jobs: - name: Create zip file run: zip -r Ottonien.zip * - - name: Upload resource pack - uses: actions/upload-artifact@v3 + - name: Set up GitHub CLI + uses: cli/cli@v2 with: - name: Resourcepack - path: Ottonien.zip + version: 'latest' + + - name: Authenticate GitHub CLI + run: gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }} + + - name: Get release tag + id: get_tag + run: echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV + + - name: Upload resource pack + run: gh release upload "$RELEASE_TAG" Ottonien.zip - name: Deploy to CDN run: | From bd9372d03a54196e5e1e709fd450d12dcbd92832 Mon Sep 17 00:00:00 2001 From: Marvin Klar Date: Fri, 3 Jan 2025 17:22:40 +0100 Subject: [PATCH 4/5] Update deployment pipeline --- .github/workflows/deploy.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e5b8a68..be4f44e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,11 +32,6 @@ jobs: - name: Create zip file run: zip -r Ottonien.zip * - - name: Set up GitHub CLI - uses: cli/cli@v2 - with: - version: 'latest' - - name: Authenticate GitHub CLI run: gh auth login --with-token <<< ${{ secrets.GITHUB_TOKEN }} From 858eaff9279db452de8730442fb2cbebf761394c Mon Sep 17 00:00:00 2001 From: Marvin Klar <34421947+MarvinKlar@users.noreply.github.com> Date: Fri, 3 Jan 2025 17:32:05 +0100 Subject: [PATCH 5/5] Update deploy.yml --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index be4f44e..70cbbc8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,7 +24,7 @@ jobs: run: | sudo apt-get update sudo apt-get install jq -y - DESCRIPTION="\u00A78Ottonien.com Serverpack v$GITHUB_REF_NAME\n\u00A72Benötigt OptiFine \u00A76[MC 1.20.4]" + DESCRIPTION="\u00A78Ottonien.com Pack v$GITHUB_REF_NAME\n\u00A72Benötigt OptiFine \u00A76[MC 1.20.4]" jq --arg desc "$DESCRIPTION" '.pack.description = $desc' pack.mcmeta > pack.meta sed 's/\\\\/\\/g' pack.meta > pack.mcmeta rm pack.meta