From 4c1e8bb3f70975c2ba4fb94ba7365caed033b4ef Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Wed, 17 Apr 2024 23:34:55 +0100 Subject: [PATCH 1/3] build: fix on tag workflow --- .github/workflows/on-tag.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 0360bba2a..3466a4d4f 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -3,6 +3,7 @@ name: On Tag on: push: tags: 'v*' + workflow_dispatch: jobs: pr-to-homebrew: @@ -15,9 +16,10 @@ jobs: 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 - - run: brew bump-cask-pr gitify --version=${{ steps.version.outputs.version }} --message="Bump gitify to ${{ steps.version.outputs.version }}" + # - id: version + # run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT + # - run: brew bump-cask-pr gitify --version=${{ steps.version.outputs.version }} --message="Bump gitify to ${{ steps.version.outputs.version }}" + - run: brew bump-cask-pr gitify --version=5.4.0 --message="Bump gitify to 5.4.0" env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GH_TOKEN }} @@ -34,8 +36,12 @@ jobs: with: node-version-file: '.nvmrc' - id: version - run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - - run: pnpm version ${{ steps.version.outputs.version }} + # run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT + run: echo "version="5.4.0"" >> $GITHUB_OUTPUT + - run: | + git config --global user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com" + git config --global user.name "${{ github.actor }}" + pnpm version ${{ steps.version.outputs.version }} - uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GITHUB_TOKEN }} From 31ac53e39a22e7778873d02b2e1ccb8a556e85d3 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Wed, 17 Apr 2024 23:36:13 +0100 Subject: [PATCH 2/3] fix: switch to trigger on branch fix/* --- .github/workflows/on-tag.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 3466a4d4f..3e6b2796a 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -3,7 +3,8 @@ name: On Tag on: push: tags: 'v*' - workflow_dispatch: + branches: + - fix/* jobs: pr-to-homebrew: From 8cf2bf43ffcf98823f303fed70867fa74e40a115 Mon Sep 17 00:00:00 2001 From: Afonso Jorge Ramos Date: Wed, 17 Apr 2024 23:41:46 +0100 Subject: [PATCH 3/3] build: remove `pr-to-homebrew` job --- .github/workflows/on-tag.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 0360bba2a..1bff521a6 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -5,22 +5,6 @@ on: tags: 'v*' jobs: - pr-to-homebrew: - name: Homebrew - runs-on: macos-14 - steps: - # 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 - - run: brew bump-cask-pr gitify --version=${{ steps.version.outputs.version }} --message="Bump gitify to ${{ steps.version.outputs.version }}" - env: - HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GH_TOKEN }} - update-website: name: Website runs-on: ubuntu-latest