Merge pull request #144087 from ZhongRuoyu/workflows-committer

workflows: attribute workflow dispatcher as commit author
Homebrew · Sep 20, 2023 · 2b1dbf8 · 2b1dbf8
2 parents 961ceb3 + 890e4f9
commit 2b1dbf8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml
@@ -161,8 +161,6 @@ jobs:
       - name: Configure Git user
         id: git-user-config
         uses: Homebrew/actions/git-user-config@master
-        with:
-          username: BrewTestBot
 
       - name: Set up commit signing
         uses: Homebrew/actions/setup-commit-signing@master
@@ -178,7 +176,7 @@ jobs:
           HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
           HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_CORE_GITHUB_PACKAGES_TOKEN}}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
-          BREWTESTBOT_NAME_EMAIL: "${{ steps.git-user-config.outputs.name }} <${{ steps.git-user-config.outputs.email }}>"
+          BREWTESTBOT_NAME_EMAIL: "BrewTestBot <[email protected]>"
         run: |
           cd ~/bottles
           brew pr-upload --verbose --keep-old --committer="$BREWTESTBOT_NAME_EMAIL" --root-url="https://ghcr.io/v2/homebrew/core"
@@ -190,8 +188,8 @@ jobs:
           directory: ${{steps.set-up-homebrew.outputs.repository-path}}
           branch: ${{env.BOTTLE_BRANCH}}
         env:
-          GIT_COMMITTER_NAME: ${{ steps.git-user-config.outputs.name }}
-          GIT_COMMITTER_EMAIL: ${{ steps.git-user-config.outputs.email }}
+          GIT_COMMITTER_NAME: BrewTestBot
+          GIT_COMMITTER_EMAIL: [email protected]
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
 
       - name: Open PR with bottle commit

diff --git a/.github/workflows/dispatch-rebottle.yml b/.github/workflows/dispatch-rebottle.yml
@@ -143,8 +143,6 @@ jobs:
       - name: Setup git
         id: git-user-config
         uses: Homebrew/actions/git-user-config@master
-        with:
-          username: BrewTestBot
 
       - name: Set up commit signing
         uses: Homebrew/actions/setup-commit-signing@master
@@ -160,7 +158,7 @@ jobs:
           HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
           HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{secrets.HOMEBREW_CORE_GITHUB_PACKAGES_TOKEN}}
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
-          BREWTESTBOT_NAME_EMAIL: "${{ steps.git-user-config.outputs.name }} <${{ steps.git-user-config.outputs.email }}>"
+          BREWTESTBOT_NAME_EMAIL: "BrewTestBot <[email protected]>"
         run: |
           cd ~/bottles
           brew pr-upload --verbose --committer="$BREWTESTBOT_NAME_EMAIL" --root-url="https://ghcr.io/v2/homebrew/core" --debug
@@ -172,8 +170,8 @@ jobs:
           directory: ${{steps.set-up-homebrew.outputs.repository-path}}
           branch: ${{env.BOTTLE_BRANCH}}
         env:
-          GIT_COMMITTER_NAME: ${{ steps.git-user-config.outputs.name }}
-          GIT_COMMITTER_EMAIL: ${{ steps.git-user-config.outputs.email }}
+          GIT_COMMITTER_NAME: BrewTestBot
+          GIT_COMMITTER_EMAIL: [email protected]
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
 
       - name: Open PR with bottle commit

diff --git a/.github/workflows/publish-commit-bottles.yml b/.github/workflows/publish-commit-bottles.yml
@@ -269,8 +269,6 @@ jobs:
       - name: Configure Git user
         id: git-user-config
         uses: Homebrew/actions/git-user-config@master
-        with:
-          username: BrewTestBot
 
       - name: Set up commit signing
         uses: Homebrew/actions/setup-commit-signing@master
@@ -287,7 +285,7 @@ jobs:
         id: pr-pull
         working-directory: ${{steps.set-up-homebrew.outputs.repository-path}}
         env:
-          BREWTESTBOT_NAME_EMAIL: "${{ steps.git-user-config.outputs.name }} <${{ steps.git-user-config.outputs.email }}>"
+          BREWTESTBOT_NAME_EMAIL: "BrewTestBot <[email protected]>"
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
           HOMEBREW_GITHUB_API_TOKEN: ${{secrets.HOMEBREW_CORE_PUBLIC_REPO_EMAIL_TOKEN}}
           HOMEBREW_GITHUB_PACKAGES_USER: brewtestbot
@@ -330,8 +328,8 @@ jobs:
           branch: ${{needs.check.outputs.branch}}
           remote_branch: ${{needs.check.outputs.remote_branch}}
         env:
-          GIT_COMMITTER_NAME: ${{ steps.git-user-config.outputs.name }}
-          GIT_COMMITTER_EMAIL: ${{ steps.git-user-config.outputs.email }}
+          GIT_COMMITTER_NAME: BrewTestBot
+          GIT_COMMITTER_EMAIL: [email protected]
           HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }}
 
       - name: Add CI-published-bottle-commits label