diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml index 9f5aed95de..d2d4244eea 100644 --- a/.github/workflows/buildAndDeploy.yml +++ b/.github/workflows/buildAndDeploy.yml @@ -153,6 +153,7 @@ jobs: - name: Upload AAB to google play uses: r0adkll/upload-google-play@v1.0.15 + continue-on-error: true with: serviceAccountJsonPlainText: ${{ secrets.GOOGLE_PLAY_SERVICE_ACCOUNT_JSON }} packageName: com.unciv.app @@ -183,37 +184,6 @@ jobs: name: UncivAPK path: Unciv-signed.apk - -## Finalize - - AUR-update: - if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') - continue-on-error: true - runs-on: ubuntu-latest - needs: build - steps: - - - name: Get AUR PKGBUILD - run: | - curl --silent --output PKGBUILD 'https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=unciv-bin' - sed -E -e "s#(_pkgver=).*#\1${{needs.build.outputs.version_tag}}#" -e "s#(pkgrel=).*#\10#" -i PKGBUILD - - - name: Publish AUR package - uses: Thyrum/github-actions-deploy-aur@master - with: - pkgname: unciv-bin - pkgbuild: ./PKGBUILD - commit_username: ${{ secrets.AUR_COMMIT_USERNAME }} - commit_email: ${{ secrets.AUR_COMMIT_EMAIL }} - ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} - commit_message: | - Update to ${{needs.build.outputs.version_tag}} - - ${{needs.build.outputs.release_body}} - ssh_keyscan_types: rsa,dsa,ecdsa,ed25519 - updpkgsums: true - allow_empty_commits: false - packr-build: if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') runs-on: ubuntu-latest @@ -371,3 +341,31 @@ jobs: *${{needs.build.outputs.version_tag}} rolling out!* ${{needs.build.outputs.release_body}} + + AUR-update: + if: github.event_name == 'push' && contains(github.ref, 'refs/tags/') + continue-on-error: true + runs-on: ubuntu-latest + needs: build + steps: + + - name: Get AUR PKGBUILD + run: | + curl --silent --output PKGBUILD 'https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=unciv-bin' + sed -E -e "s#(_pkgver=).*#\1${{needs.build.outputs.version_tag}}#" -e "s#(pkgrel=).*#\10#" -i PKGBUILD + + - name: Publish AUR package + uses: Thyrum/github-actions-deploy-aur@master + with: + pkgname: unciv-bin + pkgbuild: ./PKGBUILD + commit_username: ${{ secrets.AUR_COMMIT_USERNAME }} + commit_email: ${{ secrets.AUR_COMMIT_EMAIL }} + ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} + commit_message: | + Update to ${{needs.build.outputs.version_tag}} + + ${{needs.build.outputs.release_body}} + ssh_keyscan_types: rsa,dsa,ecdsa,ed25519 + updpkgsums: true + allow_empty_commits: false