From 2b7ab4c0679c83c10fabdb4b482b2a5adc399d4d Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Tue, 2 Apr 2024 22:00:47 -0400 Subject: [PATCH 1/2] build: ensure homebrew-cask repo is in-sync with upstream --- .github/workflows/on-tag.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 456a89728..db772e028 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -9,6 +9,7 @@ jobs: name: Homebrew runs-on: macos-14 steps: + - run: gh repo sync setchy/homebrew-cask -b master - uses: Homebrew/actions/setup-homebrew@master - id: version run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT From 59f94f99509782752799ae253b6cae79c1910414 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Wed, 3 Apr 2024 11:07:05 -0400 Subject: [PATCH 2/2] build: add comment for future us sanity --- .github/workflows/on-tag.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index db772e028..37cb06048 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -9,7 +9,11 @@ jobs: name: Homebrew runs-on: macos-14 steps: - - run: gh repo sync setchy/homebrew-cask -b master + # Ensure our Homebrew/homebrew-cask fork repository is in-sync with the upstream to avoid conflicts + # during automated commit and PR creation in the brew bump-cask-pr step below. + - run: gh repo sync setchy/homebrew-cask -b master + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} - uses: Homebrew/actions/setup-homebrew@master - id: version run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT