From d2cb84f284334c760ee10378297b6e5414ed8184 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Wed, 20 Sep 2023 02:09:49 +0800 Subject: [PATCH 1/3] dispatch-build-bottle: attribute workflow dispatcher as commit author Resolves #144071. --- .github/workflows/dispatch-build-bottle.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dispatch-build-bottle.yml b/.github/workflows/dispatch-build-bottle.yml index 6d33db0946bca..58c8d97f4a3d5 100644 --- 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 <1589480+BrewTestBot@users.noreply.github.com>" 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: 1589480+BrewTestBot@users.noreply.github.com HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }} - name: Open PR with bottle commit From d1bb8ccc46b1da9bb574192bdedfc3d6f10a6d45 Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Wed, 20 Sep 2023 02:09:57 +0800 Subject: [PATCH 2/3] dispatch-rebottle: attribute workflow dispatcher as commit author Resolves #144071. --- .github/workflows/dispatch-rebottle.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/dispatch-rebottle.yml b/.github/workflows/dispatch-rebottle.yml index faa60f0e63ea6..92a5706025130 100644 --- 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 <1589480+BrewTestBot@users.noreply.github.com>" 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: 1589480+BrewTestBot@users.noreply.github.com HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }} - name: Open PR with bottle commit From 890e4f9f14f50fdf2b5b7fcbee57236c82476d7d Mon Sep 17 00:00:00 2001 From: Ruoyu Zhong Date: Wed, 20 Sep 2023 02:10:06 +0800 Subject: [PATCH 3/3] publish-commit-bottles: attribute workflow dispatcher as commit author Resolves #144071. --- .github/workflows/publish-commit-bottles.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish-commit-bottles.yml b/.github/workflows/publish-commit-bottles.yml index 2c613f2dd56e8..d4b43ea964142 100644 --- 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 <1589480+BrewTestBot@users.noreply.github.com>" 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: 1589480+BrewTestBot@users.noreply.github.com HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }} - name: Add CI-published-bottle-commits label