ci: nth time's the charm for winget tag pr thing

wez · Aug 7, 2022 · c2fee76 · c2fee76
1 parent 608750d
commit c2fee76
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/gen_windows_tag.yml b/.github/workflows/gen_windows_tag.yml
@@ -83,10 +83,13 @@ jobs:
           repository: "wez/winget-pkgs"
           path: "winget-pkgs"
           token: "${{ secrets.GH_PAT }}"
+      - name: "Setup email for winget repo"
+        shell: bash
+        run: "cd winget-pkgs && git config user.email [email protected]"
+      - name: "Setup name for winget repo"
+        shell: bash
+        run: "cd winget-pkgs && git config user.name 'Wez Furlong'"
       - 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"

diff --git a/ci/generate-workflows.py b/ci/generate-workflows.py
@@ -569,13 +569,17 @@ def create_winget_pr(self):
                         "token": "${{ secrets.GH_PAT }}",
                     },
                 ),
+                RunStep(
+                    "Setup email for winget repo",
+                    "cd winget-pkgs && git config user.email [email protected]",
+                ),
+                RunStep(
+                    "Setup name for winget repo",
+                    "cd winget-pkgs && git config user.name 'Wez Furlong'",
+                ),
                 RunStep(
                     "Create winget manifest and push to fork",
                     "bash ci/make-winget-pr.sh winget-pkgs WezTerm-*.exe",
-                    env={
-                        "GIT_AUTHOR_NAME": "Wez Furlong",
-                        "GIT_AUTHOR_EMAIL": "[email protected]",
-                    },
                 ),
                 RunStep(
                     "Submit PR",

diff --git a/ci/make-winget-pr.sh b/ci/make-winget-pr.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+set -xe
 
 winget_repo=$1
 setup_exe=$2