ci: tweak winget pr stuff a bit more

zed-industries · Aug 7, 2022 · 306da9d · 306da9d
1 parent 56aa713
commit 306da9d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/gen_windows_tag.yml b/.github/workflows/gen_windows_tag.yml
@@ -52,23 +52,6 @@ jobs:
           path: |
             WezTerm-*.zip
             WezTerm-*.exe
-      - name: "Checkout winget-pkgs"
-        uses: actions/checkout@v3
-        with:
-          repository: "wez/winget-pkgs"
-          path: "winget-pkgs"
-          token: "${{ secrets.GH_PAT }}"
-      - name: "Create winget manifest and push to fork"
-        env:
-          GIT_AUTHOR_EMAIL: [email protected]
-          GIT_AUTHOR_NAME: Wez Furlong
-        shell: bash
-        run: "bash ci/make-winget-pr.sh winget-pkgs WezTerm-*.exe"
-      - name: "Submit PR"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
-        shell: bash
-        run: 'gh pr create --fill --body "PR automatically created by release automation in the wezterm repo"'
 
   upload:
     runs-on: ubuntu-latest
@@ -94,3 +77,20 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         shell: bash
         run: "bash ci/retry.sh gh release upload --clobber $(ci/tag-name.sh) WezTerm-*.zip WezTerm-*.exe *.sha256"
+      - name: "Checkout winget-pkgs"
+        uses: actions/checkout@v3
+        with:
+          repository: "wez/winget-pkgs"
+          path: "winget-pkgs"
+          token: "${{ secrets.GH_PAT }}"
+      - name: "Create winget manifest and push to fork"
+        env:
+          GIT_AUTHOR_EMAIL: [email protected]
+          GIT_AUTHOR_NAME: Wez Furlong
+        shell: bash
+        run: "bash ci/make-winget-pr.sh winget-pkgs WezTerm-*.exe"
+      - name: "Submit PR"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_PAT }}
+        shell: bash
+        run: 'cd winget-pkgs && gh pr create --fill --body "PR automatically created by release automation in the wezterm repo"'
diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py
@@ -579,7 +579,7 @@ def create_winget_pr(self):
                 ),
                 RunStep(
                     "Submit PR",
-                    'gh pr create --fill --body "PR automatically created by release automation in the wezterm repo"',
+                    'cd winget-pkgs && gh pr create --fill --body "PR automatically created by release automation in the wezterm repo"',
                     env={
                         "GITHUB_TOKEN": "${{ secrets.GH_PAT }}",
                     },
@@ -793,11 +793,10 @@ def tag(self):
         steps += self.package(trusted=True)
         steps += self.upload_artifact()
         steps += self.update_homebrew_tap()
-        steps += self.create_winget_pr()
 
         uploader = Job(
             runs_on="ubuntu-latest",
-            steps=self.checkout(submodules=False) + self.upload_asset_tag(),
+            steps=self.checkout(submodules=False) + self.upload_asset_tag() + self.create_winget_pr()
         )
 
         return (