From 96923642112660db281e65760cab8b212dcb47e1 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 10 Sep 2021 18:50:11 +0100 Subject: [PATCH 1/3] workflows: set GITHUB_TOKEN for gh usage --- .github/workflows/sorbet.yml | 1 + .github/workflows/spdx.yml | 1 + .github/workflows/update-man-completions.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml index 07c3b5a85f..5f3320f72a 100644 --- a/.github/workflows/sorbet.yml +++ b/.github/workflows/sorbet.yml @@ -32,6 +32,7 @@ jobs: - name: Update RBI files id: update env: + GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }} HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }} run: | git fetch origin diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml index ce34455716..af88653141 100644 --- a/.github/workflows/spdx.yml +++ b/.github/workflows/spdx.yml @@ -29,6 +29,7 @@ jobs: - name: Update SPDX license data id: update env: + GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }} HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }} run: | git fetch origin diff --git a/.github/workflows/update-man-completions.yml b/.github/workflows/update-man-completions.yml index 5adb733df4..3e032bd4fd 100644 --- a/.github/workflows/update-man-completions.yml +++ b/.github/workflows/update-man-completions.yml @@ -69,6 +69,7 @@ jobs: fi fi env: + GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_PUBLIC_REPO_TOKEN }} HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_BREW_UPDATE_MAINTAINERS_TOKEN }} HOMEBREW_GPG_PASSPHRASE: ${{ secrets.BREWTESTBOT_GPG_SIGNING_SUBKEY_PASSPHRASE }} From aebcd5fdd425b528b5f01f97cc89a673aa0aa2fa Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 10 Sep 2021 19:01:19 +0100 Subject: [PATCH 2/3] workflows: don't make new branch track master --- .github/workflows/sorbet.yml | 2 +- .github/workflows/spdx.yml | 2 +- .github/workflows/update-man-completions.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml index 5f3320f72a..a60b6e0d84 100644 --- a/.github/workflows/sorbet.yml +++ b/.github/workflows/sorbet.yml @@ -44,7 +44,7 @@ jobs: git checkout "$BRANCH" git reset --hard origin/master else - git checkout -B "$BRANCH" origin/master + git checkout --no-track -B "$BRANCH" origin/master fi if brew typecheck --update --fail-if-not-changed; then diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml index af88653141..6ab7b44787 100644 --- a/.github/workflows/spdx.yml +++ b/.github/workflows/spdx.yml @@ -41,7 +41,7 @@ jobs: git checkout "$BRANCH" git reset --hard origin/master else - git checkout -B "$BRANCH" origin/master + git checkout --no-track -B "$BRANCH" origin/master fi if brew update-license-data --fail-if-not-changed; then diff --git a/.github/workflows/update-man-completions.yml b/.github/workflows/update-man-completions.yml index 3e032bd4fd..ad45934cb9 100644 --- a/.github/workflows/update-man-completions.yml +++ b/.github/workflows/update-man-completions.yml @@ -48,7 +48,7 @@ jobs: git checkout "$BRANCH" git reset --hard origin/master else - git checkout -B "$BRANCH" origin/master + git checkout --no-track -B "$BRANCH" origin/master fi if [ "${{github.event_name}}" != "push" ]; then From 9d168ff4831e26026c4ea87bc0bd016a6cf5d385 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 10 Sep 2021 19:25:53 +0100 Subject: [PATCH 3/3] workflows: fix gh parsing --- .github/workflows/sorbet.yml | 2 +- .github/workflows/spdx.yml | 2 +- .github/workflows/update-man-completions.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/sorbet.yml b/.github/workflows/sorbet.yml index a60b6e0d84..ff8b18b8a8 100644 --- a/.github/workflows/sorbet.yml +++ b/.github/workflows/sorbet.yml @@ -52,7 +52,7 @@ jobs: git commit -m "sorbet: Update RBI files." \ -m "Autogenerated by the [sorbet](https://github.com/Homebrew/brew/blob/master/.github/workflows/sorbet.yml) workflow." echo "::set-output name=committed::true" - PULL_REQUEST_STATE=$(gh pr view --json=state) + PULL_REQUEST_STATE=$(gh pr view --json=state | jq -r ".state") if [ "$PULL_REQUEST_STATE" != "OPEN" ]; then echo "::set-output name=pull_request::true" fi diff --git a/.github/workflows/spdx.yml b/.github/workflows/spdx.yml index 6ab7b44787..3797770d1b 100644 --- a/.github/workflows/spdx.yml +++ b/.github/workflows/spdx.yml @@ -48,7 +48,7 @@ jobs: git add "$GITHUB_WORKSPACE/Library/Homebrew/data/spdx" git commit -m "spdx: update license data." -m "Autogenerated by [a scheduled GitHub Action](https://github.com/Homebrew/brew/blob/master/.github/workflows/spdx.yml)." echo "::set-output name=committed::true" - PULL_REQUEST_STATE=$(gh pr view --json=state) + PULL_REQUEST_STATE=$(gh pr view --json=state | jq -r ".state") if [ "$PULL_REQUEST_STATE" != "OPEN" ]; then echo "::set-output name=pull_request::true" fi diff --git a/.github/workflows/update-man-completions.yml b/.github/workflows/update-man-completions.yml index ad45934cb9..71125d33c4 100644 --- a/.github/workflows/update-man-completions.yml +++ b/.github/workflows/update-man-completions.yml @@ -63,7 +63,7 @@ jobs: git commit -m "Update maintainers, manpage and completions." \ -m "Autogenerated by the [update-man-completions](https://github.com/Homebrew/brew/blob/HEAD/.github/workflows/update-man-completions.yml) workflow." echo "::set-output name=committed::true" - PULL_REQUEST_STATE=$(gh pr view --json=state) + PULL_REQUEST_STATE=$(gh pr view --json=state | jq -r ".state") if [ "$PULL_REQUEST_STATE" != "OPEN" ]; then echo "::set-output name=pull_request::true" fi