From 38155f17a0c89209f1a20f1d7b7f9cc9d7b60147 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:23:53 -0400 Subject: [PATCH 01/24] fix: use correct token var in website version bump workflow --- .github/workflows/on-tag.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 1bff521a6..a3ba44d9c 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -10,26 +10,30 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + name: Checkout website with: repository: gitify-app/website token: ${{ secrets.GH_TOKEN }} - uses: pnpm/action-setup@v3 + name: Setup pnpm - uses: actions/setup-node@v4 + name: Setup Node.js with: node-version-file: '.nvmrc' - id: version + name: Bump version to latest tag run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - run: pnpm version ${{ steps.version.outputs.version }} - uses: peter-evans/create-pull-request@v6 + name: Create pull request with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: 'docs: update latest release to ${{ steps.version.outputs.version }}' - committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> - signoff: false + token: ${{ secrets.GH_TOKEN }} + commit-message: | + docs: update latest release to ${{ steps.version.outputs.version }} branch: 'bump/${{ steps.version.outputs.version }}' delete-branch: true - title: 'docs: update latest release to ${{ steps.version.outputs.version }}' + title: | + docs: update latest release to ${{ steps.version.outputs.version }} body: | Update latest release to ${{ steps.version.outputs.version }} labels: | From 33c6ceed01ba9aec10b0651fdbabfdd952a6abae Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:33:12 -0400 Subject: [PATCH 02/24] verify fix --- .github/workflows/on-tag.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index a3ba44d9c..6dca27fa4 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -3,6 +3,8 @@ name: On Tag on: push: tags: 'v*' + branches: + - fix/* jobs: update-website: From d80925db2446d050c256fedb356dbf32a5ee346d Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:34:33 -0400 Subject: [PATCH 03/24] verify fix --- .github/workflows/on-tag.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 6dca27fa4..2ae84f5d8 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -11,11 +11,6 @@ jobs: name: Website runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - name: Checkout website - with: - repository: gitify-app/website - token: ${{ secrets.GH_TOKEN }} - uses: pnpm/action-setup@v3 name: Setup pnpm - uses: actions/setup-node@v4 @@ -26,6 +21,11 @@ jobs: name: Bump version to latest tag run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - run: pnpm version ${{ steps.version.outputs.version }} + - uses: actions/checkout@v4 + name: Checkout website + with: + repository: gitify-app/website + token: ${{ secrets.GH_TOKEN }} - uses: peter-evans/create-pull-request@v6 name: Create pull request with: From 056c67b0629cf15b13c6cb56c7cddb7890035ab7 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:35:43 -0400 Subject: [PATCH 04/24] verify fix --- .github/workflows/on-tag.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 2ae84f5d8..6c1ae3c3b 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -8,9 +8,11 @@ on: jobs: update-website: - name: Website + name: Update Website Version runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 + name: Checkout gitify-app/gitify - uses: pnpm/action-setup@v3 name: Setup pnpm - uses: actions/setup-node@v4 @@ -22,7 +24,7 @@ jobs: run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - run: pnpm version ${{ steps.version.outputs.version }} - uses: actions/checkout@v4 - name: Checkout website + name: Checkout gitify-app/website with: repository: gitify-app/website token: ${{ secrets.GH_TOKEN }} From d4835c33d6f8fb55444239fbd61894d423105ba5 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:39:05 -0400 Subject: [PATCH 05/24] verify fix --- .github/workflows/on-tag.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 6c1ae3c3b..5447980a0 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -4,7 +4,7 @@ on: push: tags: 'v*' branches: - - fix/* + - fix/* # remove before merging jobs: update-website: @@ -21,7 +21,8 @@ jobs: node-version-file: '.nvmrc' - id: version name: Bump version to latest tag - run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT + #run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging + run: echo "version=5.4.1" >> $GITHUB_ENV # remove before merging - run: pnpm version ${{ steps.version.outputs.version }} - uses: actions/checkout@v4 name: Checkout gitify-app/website From b9697919a9c5d635d0e0ab1cfec5c4f99742f659 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:42:10 -0400 Subject: [PATCH 06/24] verify fix --- .github/workflows/on-tag.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 5447980a0..04f159c7b 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -13,22 +13,29 @@ jobs: steps: - uses: actions/checkout@v4 name: Checkout gitify-app/gitify + - uses: pnpm/action-setup@v3 name: Setup pnpm + - uses: actions/setup-node@v4 name: Setup Node.js with: node-version-file: '.nvmrc' + - id: version - name: Bump version to latest tag + name: Find latest version tag #run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging run: echo "version=5.4.1" >> $GITHUB_ENV # remove before merging - - run: pnpm version ${{ steps.version.outputs.version }} + - uses: actions/checkout@v4 name: Checkout gitify-app/website with: repository: gitify-app/website token: ${{ secrets.GH_TOKEN }} + + - name: Bump version + run: pnpm version ${{ steps.version.outputs.version }} + - uses: peter-evans/create-pull-request@v6 name: Create pull request with: From 8693eb7d3874722bb0cc05cac55834ad70679b04 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:51:35 -0400 Subject: [PATCH 07/24] verify fix --- .github/workflows/on-tag.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 04f159c7b..4b4de42bc 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -22,10 +22,9 @@ jobs: with: node-version-file: '.nvmrc' - - id: version - name: Find latest version tag + - name: Find latest version tag #run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging - run: echo "version=5.4.1" >> $GITHUB_ENV # remove before merging + run: echo "gitify_version=5.4.1" >> $GITHUB_ENV # remove before merging - uses: actions/checkout@v4 name: Checkout gitify-app/website @@ -34,19 +33,19 @@ jobs: token: ${{ secrets.GH_TOKEN }} - name: Bump version - run: pnpm version ${{ steps.version.outputs.version }} + run: pnpm version ${{ env.GITIFY_VERSION }} - uses: peter-evans/create-pull-request@v6 name: Create pull request with: token: ${{ secrets.GH_TOKEN }} commit-message: | - docs: update latest release to ${{ steps.version.outputs.version }} - branch: 'bump/${{ steps.version.outputs.version }}' + docs: update latest release to ${{ env.GITIFY_VERSION }} + branch: 'bump/${{ env.GITIFY_VERSION }}' delete-branch: true title: | - docs: update latest release to ${{ steps.version.outputs.version }} + docs: update latest release to ${{ env.GITIFY_VERSION }} body: | - Update latest release to ${{ steps.version.outputs.version }} + Update latest release to ${{ env.GITIFY_VERSION }} labels: | documentation From a21f3c6d5ab7e4a10b9a997521c190424d0b3b38 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:53:28 -0400 Subject: [PATCH 08/24] verify fix --- .github/workflows/on-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 4b4de42bc..8a7c67942 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -41,7 +41,7 @@ jobs: token: ${{ secrets.GH_TOKEN }} commit-message: | docs: update latest release to ${{ env.GITIFY_VERSION }} - branch: 'bump/${{ env.GITIFY_VERSION }}' + branch: 'bump/gitify-version' delete-branch: true title: | docs: update latest release to ${{ env.GITIFY_VERSION }} From d4e03a6b47211bc6c884434564a230084a4aad33 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 08:59:28 -0400 Subject: [PATCH 09/24] verify fix --- .github/workflows/on-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 8a7c67942..45f50b054 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -24,7 +24,7 @@ jobs: - name: Find latest version tag #run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging - run: echo "gitify_version=5.4.1" >> $GITHUB_ENV # remove before merging + run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_ENV # remove before merging - uses: actions/checkout@v4 name: Checkout gitify-app/website From 91ecc12e39634153db25d4c272b39c54afa28f36 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:17:24 -0400 Subject: [PATCH 10/24] verify fix --- .github/workflows/on-tag.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 45f50b054..1488e8848 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -31,17 +31,28 @@ jobs: with: repository: gitify-app/website token: ${{ secrets.GH_TOKEN }} - + + - name: setup git config + run: | + git config user.name github-actions + git config user.email github-actions@github.com + + - name: Create branch + run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" + - name: Bump version run: pnpm version ${{ env.GITIFY_VERSION }} + - name: Push changes + run: git push origin "bump/${{ env.GITIFY_VERSION }}" + - uses: peter-evans/create-pull-request@v6 name: Create pull request with: token: ${{ secrets.GH_TOKEN }} commit-message: | docs: update latest release to ${{ env.GITIFY_VERSION }} - branch: 'bump/gitify-version' + branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: | docs: update latest release to ${{ env.GITIFY_VERSION }} From 706d6811cc0e097fc4212a25410a4ed12ca02b41 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:18:15 -0400 Subject: [PATCH 11/24] verify fix --- .github/workflows/on-tag.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 1488e8848..c4cd622ab 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -37,15 +37,9 @@ jobs: git config user.name github-actions git config user.email github-actions@github.com - - name: Create branch - run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" - - name: Bump version run: pnpm version ${{ env.GITIFY_VERSION }} - - name: Push changes - run: git push origin "bump/${{ env.GITIFY_VERSION }}" - - uses: peter-evans/create-pull-request@v6 name: Create pull request with: From e5ade15fbc272b4af6abed77091843c7f30daf4f Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:24:13 -0400 Subject: [PATCH 12/24] verify fix --- .github/workflows/on-tag.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index c4cd622ab..7d80d7331 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -32,13 +32,15 @@ jobs: repository: gitify-app/website token: ${{ secrets.GH_TOKEN }} - - name: setup git config + - name: Setup git run: | - git config user.name github-actions - git config user.email github-actions@github.com - + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com + - name: Bump version - run: pnpm version ${{ env.GITIFY_VERSION }} + run: | + pnpm version ${{ env.GITIFY_VERSION }} + git commit -am "chore: update release to ${{ env.GITIFY_VERSION }}" - uses: peter-evans/create-pull-request@v6 name: Create pull request @@ -46,6 +48,8 @@ jobs: token: ${{ secrets.GH_TOKEN }} commit-message: | docs: update latest release to ${{ env.GITIFY_VERSION }} + committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: | From c61fddf62b4928bcd54a9a21387cb95e9527c2c9 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:27:14 -0400 Subject: [PATCH 13/24] verify fix --- .github/workflows/on-tag.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 7d80d7331..d51a9596d 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -37,6 +37,10 @@ jobs: git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com + - name: Create version branch + run: | + git checkout -b "bump/${{ env.GITIFY_VERSION }}" + - name: Bump version run: | pnpm version ${{ env.GITIFY_VERSION }} From 1dacb6edbe913c4fb75ce06282da694b6fe971a2 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:35:09 -0400 Subject: [PATCH 14/24] fix: website version bump --- .github/workflows/on-tag.yml | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index d51a9596d..61f2e22e7 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -12,40 +12,26 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - name: Checkout gitify-app/gitify - + with: + repository: gitify-app/website + token: ${{ secrets.GH_TOKEN }} - uses: pnpm/action-setup@v3 - name: Setup pnpm - - uses: actions/setup-node@v4 - name: Setup Node.js with: node-version-file: '.nvmrc' - - name: Find latest version tag - #run: echo "version=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging + - name: Bump version to latest tag + # run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_ENV # remove before merging - - - uses: actions/checkout@v4 - name: Checkout gitify-app/website - with: - repository: gitify-app/website - token: ${{ secrets.GH_TOKEN }} - - name: Setup git + - name: setup git config run: | git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com - - - name: Create version branch - run: | - git checkout -b "bump/${{ env.GITIFY_VERSION }}" + - run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" + - run: pnpm version ${{ env.GITIFY_VERSION }} + - run: git push origin "bump/${{ env.GITIFY_VERSION }}" - - name: Bump version - run: | - pnpm version ${{ env.GITIFY_VERSION }} - git commit -am "chore: update release to ${{ env.GITIFY_VERSION }}" - - uses: peter-evans/create-pull-request@v6 name: Create pull request with: From d00bd558d65488b9169c32040f4e6ae4d4715c22 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:36:34 -0400 Subject: [PATCH 15/24] fix: website version bump --- .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 61f2e22e7..86761172d 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -40,6 +40,7 @@ jobs: docs: update latest release to ${{ env.GITIFY_VERSION }} committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> + base: main branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: | From 00c6d5f2704b4cb9a2b1b9a8e8a5b989506c959e Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:37:34 -0400 Subject: [PATCH 16/24] fix: website version bump --- .github/workflows/on-tag.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 86761172d..be201c33c 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -28,9 +28,9 @@ jobs: run: | git config user.name github-actions[bot] git config user.email 41898282+github-actions[bot]@users.noreply.github.com - - run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" + # - run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" - run: pnpm version ${{ env.GITIFY_VERSION }} - - run: git push origin "bump/${{ env.GITIFY_VERSION }}" + # - run: git push origin "bump/${{ env.GITIFY_VERSION }}" - uses: peter-evans/create-pull-request@v6 name: Create pull request From 1982083bc554ee1abdfe0a3587e5d657b7dd341a Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:39:36 -0400 Subject: [PATCH 17/24] fix: website version bump --- .github/workflows/on-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index be201c33c..b6e00a5a8 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -39,7 +39,7 @@ jobs: commit-message: | docs: update latest release to ${{ env.GITIFY_VERSION }} committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> + author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> base: main branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true From 756acd9456cedf1d870db052b13d4ed442af58bd Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:43:26 -0400 Subject: [PATCH 18/24] fix: website version bump --- .github/workflows/on-tag.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index b6e00a5a8..6d619f53a 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -24,10 +24,10 @@ jobs: # run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_ENV # remove before merging - - name: setup git config - run: | - git config user.name github-actions[bot] - git config user.email 41898282+github-actions[bot]@users.noreply.github.com + # - name: setup git config + # run: | + # git config user.name github-actions[bot] + # git config user.email 41898282+github-actions[bot]@users.noreply.github.com # - run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" - run: pnpm version ${{ env.GITIFY_VERSION }} # - run: git push origin "bump/${{ env.GITIFY_VERSION }}" @@ -37,15 +37,15 @@ jobs: with: token: ${{ secrets.GH_TOKEN }} commit-message: | - docs: update latest release to ${{ env.GITIFY_VERSION }} + docs: update to latest release version ${{ env.GITIFY_VERSION }} committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> + author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> base: main branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: | - docs: update latest release to ${{ env.GITIFY_VERSION }} + docs: update to latest release version ${{ env.GITIFY_VERSION }} body: | - Update latest release to ${{ env.GITIFY_VERSION }} + Automated update to latest release version ${{ env.GITIFY_VERSION }} labels: | documentation From f7d2089765c0b06c8a1a1ef3287cbc6b3dcd29d7 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 09:58:15 -0400 Subject: [PATCH 19/24] fix: website version bump --- .github/workflows/on-tag.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 6d619f53a..50c0211ba 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -11,12 +11,17 @@ jobs: name: Update Website Version runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - name: Checkout website repository + uses: actions/checkout@v4 with: repository: gitify-app/website token: ${{ secrets.GH_TOKEN }} - - uses: pnpm/action-setup@v3 - - uses: actions/setup-node@v4 + + - name: Setup pnpm + uses: pnpm/action-setup@v3 + + - name: Setup node + uses: actions/setup-node@v4 with: node-version-file: '.nvmrc' @@ -24,16 +29,16 @@ jobs: # run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_ENV # remove before merging - # - name: setup git config - # run: | - # git config user.name github-actions[bot] - # git config user.email 41898282+github-actions[bot]@users.noreply.github.com - # - run: git checkout -b "bump/${{ env.GITIFY_VERSION }}" - - run: pnpm version ${{ env.GITIFY_VERSION }} - # - run: git push origin "bump/${{ env.GITIFY_VERSION }}" + - name: Setup git config + run: | + git config user.name github-actions[bot] + git config user.email 41898282+github-actions[bot]@users.noreply.github.com + + - name: Bump version to latest + run: pnpm version ${{ env.GITIFY_VERSION }} - - uses: peter-evans/create-pull-request@v6 - name: Create pull request + - name: Create pull request + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GH_TOKEN }} commit-message: | From 7835a373a9edf242f6a2b74ce96923a89316b0b3 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 10:03:00 -0400 Subject: [PATCH 20/24] fix: website version bump --- .github/workflows/on-tag.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 50c0211ba..514526bb2 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -41,8 +41,7 @@ jobs: uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GH_TOKEN }} - commit-message: | - docs: update to latest release version ${{ env.GITIFY_VERSION }} + commit-message: "docs: update to latest release version ${{ env.GITIFY_VERSION }}" committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> base: main From bcf47e776a3bde9ab5d15900f1ea96c707bc7670 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 10:06:15 -0400 Subject: [PATCH 21/24] fix: website version bump --- .github/workflows/on-tag.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 514526bb2..ba7af25ad 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -41,10 +41,6 @@ jobs: uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.GH_TOKEN }} - commit-message: "docs: update to latest release version ${{ env.GITIFY_VERSION }}" - committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> - author: ${{ github.actor }} <${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com> - base: main branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: | From ac270bc710bbb15f854ac77592f793e9f490701b Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 10:08:15 -0400 Subject: [PATCH 22/24] fix: website version bump --- .github/workflows/on-tag.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index ba7af25ad..80917d3b2 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -3,8 +3,6 @@ name: On Tag on: push: tags: 'v*' - branches: - - fix/* # remove before merging jobs: update-website: @@ -26,8 +24,7 @@ jobs: node-version-file: '.nvmrc' - name: Bump version to latest tag - # run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT # uncomment before merging - run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_ENV # remove before merging + run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - name: Setup git config run: | From f6c28e204ca2ae9658f211346ca9f5d1e28cfe97 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 10:13:17 -0400 Subject: [PATCH 23/24] test using github token --- .github/workflows/on-tag.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 80917d3b2..57fafb798 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -3,6 +3,8 @@ name: On Tag on: push: tags: 'v*' + branches: + - fix/* jobs: update-website: @@ -13,7 +15,7 @@ jobs: uses: actions/checkout@v4 with: repository: gitify-app/website - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} - name: Setup pnpm uses: pnpm/action-setup@v3 @@ -24,7 +26,8 @@ jobs: node-version-file: '.nvmrc' - name: Bump version to latest tag - run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT + # run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT + run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_OUTPUT - name: Setup git config run: | @@ -37,7 +40,7 @@ jobs: - name: Create pull request uses: peter-evans/create-pull-request@v6 with: - token: ${{ secrets.GH_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: | From c440b8018098bdf9fd030454ef747d46e0c5e215 Mon Sep 17 00:00:00 2001 From: Adam Setch Date: Fri, 19 Apr 2024 10:15:05 -0400 Subject: [PATCH 24/24] fix: website version bump --- .github/workflows/on-tag.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 57fafb798..80917d3b2 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -3,8 +3,6 @@ name: On Tag on: push: tags: 'v*' - branches: - - fix/* jobs: update-website: @@ -15,7 +13,7 @@ jobs: uses: actions/checkout@v4 with: repository: gitify-app/website - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_TOKEN }} - name: Setup pnpm uses: pnpm/action-setup@v3 @@ -26,8 +24,7 @@ jobs: node-version-file: '.nvmrc' - name: Bump version to latest tag - # run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - run: echo "GITIFY_VERSION=5.4.1" >> $GITHUB_OUTPUT + run: echo "GITIFY_VERSION=$(echo ${{ github.ref }} | sed 's/refs\/tags\/v//')" >> $GITHUB_OUTPUT - name: Setup git config run: | @@ -40,7 +37,7 @@ jobs: - name: Create pull request uses: peter-evans/create-pull-request@v6 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_TOKEN }} branch: "bump/${{ env.GITIFY_VERSION }}" delete-branch: true title: |