Reorder GitHub Packages steps.

This will avoid pushes happening even on failures.

.github/workflows/dispatch-build-bottle.yml

@@ -151,18 +151,18 @@ jobs:
           cd ~/bottles
           brew pr-upload --verbose --keep-old --committer="$BREWTESTBOT_NAME_EMAIL"
 
-      - name: Push commits
-        uses: Homebrew/actions/git-try-push@master
-        with:
-          token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
-
       - name: Upload bottles to GitHub Packages
         env:
           HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
           HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
         run: |
           cd ~/bottles
-          brew pr-upload --verbose --keep-old --root-url="https://ghcr.io/v2/Homebrew/homebrew-core"
+          brew pr-upload --verbose --keep-old --no-commit --root-url="https://ghcr.io/v2/Homebrew/homebrew-core"
+
+      - name: Push commits
+        uses: Homebrew/actions/git-try-push@master
+        with:
+          token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
 
       - name: Post comment on failure
         if: ${{!success() && github.event.inputs.issue > 0}}

.github/workflows/dispatch-rebottle.yml

@@ -152,18 +152,18 @@ jobs:
           cd ~/bottles
           brew pr-upload --verbose --committer="$BREWTESTBOT_NAME_EMAIL"
 
-      - name: Push commits
-        uses: Homebrew/actions/git-try-push@master
-        with:
-          token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
-
       - name: Upload bottles to GitHub Packages
         env:
           HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
           HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
         run: |
           cd ~/bottles
-          brew pr-upload --verbose --root-url="https://ghcr.io/v2/Homebrew/homebrew-core"
+          brew pr-upload --verbose --no-commit --root-url="https://ghcr.io/v2/Homebrew/homebrew-core"
+
+      - name: Push commits
+        uses: Homebrew/actions/git-try-push@master
+        with:
+          token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
 
       - name: Post comment on failure
         if: ${{!success() && github.event.inputs.issue > 0}}

.github/workflows/publish-commit-bottles.yml

@@ -71,17 +71,17 @@ jobs:
           BREWTESTBOT_NAME_EMAIL: "BrewTestBot <1589480+BrewTestBot@users.noreply.github.com>"
         run: brew pr-pull --debug --workflows=tests.yml --committer="$BREWTESTBOT_NAME_EMAIL" ${{github.event.inputs.args}} ${{github.event.inputs.pull_request}}
 
-      - name: Push commits
-        uses: Homebrew/actions/git-try-push@master
-        with:
-          token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
-
       - name: Pull and upload bottles to GitHub Packages
         env:
           HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
           HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
           HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_GITHUB_PACKAGES_API_TOKEN}}
-        run: brew pr-pull --debug --workflows=tests.yml ${{github.event.inputs.args}} ${{github.event.inputs.pull_request}} --verbose --root-url="https://ghcr.io/v2/Homebrew/homebrew-core"
+        run: brew pr-pull --debug --workflows=tests.yml --no-commit --verbose --root-url="https://ghcr.io/v2/Homebrew/homebrew-core" ${{github.event.inputs.args}} ${{github.event.inputs.pull_request}}
+
+      - name: Push commits
+        uses: Homebrew/actions/git-try-push@master
+        with:
+          token: ${{secrets.HOMEBREW_GITHUB_API_TOKEN}}
 
       - name: Post comment on failure
         if: ${{!success()}}