Merge branch 'main' into release/v5.5.0

alma · Jul 29, 2024 · dfd3798 · dfd3798
2 parents 6e01115 + 833afc0
commit dfd3798
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 0 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -21,6 +21,7 @@ categories:
 
 exclude-labels:
   - 'skip-changelog'
+  - 'release'
   - 'type: chore'
   - 'type: ci'
   - 'type: refactor'

diff --git a/.github/workflows/backport-pull-request.yml b/.github/workflows/backport-pull-request.yml
@@ -27,9 +27,20 @@ jobs:
             git fetch origin main:main
             git reset --hard main
 
+        # If using default Github token, the created pull request won't trigger workflows with pull_request event
+        # See https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
+        - name: Generate Github token to create PR
+          uses: actions/create-github-app-token@v1
+          id: github-token
+          with:
+            app-id: ${{ secrets.ALMA_CREATE_TEAM_PRS_APP_ID }}
+            private-key: ${{ secrets.ALMA_CREATE_TEAM_PRS_APP_PEM }}
+            repositories: alma-woocommerce-gateway
+
         - name: Create Pull Request
           uses: peter-evans/create-pull-request@v6
           with:
+            token: ${{ steps.github-token.outputs.token }}
             commit-message: 'chore: backport main to develop'
             title: Backport main to develop
             branch: chore/backport-main-to-develop

diff --git a/.github/workflows/hotfix-pull-request.yml b/.github/workflows/hotfix-pull-request.yml
@@ -48,9 +48,20 @@ jobs:
         run: |
           ./bin/update-files-with-release-version.sh ${{ steps.release-drafter.outputs.tag_name }}
 
+      # If using default Github token, the created pull request won't trigger workflows with pull_request event
+      # See https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
+      - name: Generate Github token to create PR
+        uses: actions/create-github-app-token@v1
+        id: github-token
+        with:
+          app-id: ${{ secrets.ALMA_CREATE_TEAM_PRS_APP_ID }}
+          private-key: ${{ secrets.ALMA_CREATE_TEAM_PRS_APP_PEM }}
+          repositories: alma-woocommerce-gateway
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
+          token: ${{ steps.github-token.outputs.token }}
           commit-message: 'chore: update version'
           title: Release ${{ steps.release-drafter.outputs.tag_name }}
           body: |

diff --git a/.github/workflows/release-pull-request.yml b/.github/workflows/release-pull-request.yml
@@ -44,9 +44,20 @@ jobs:
         run: |
           ./bin/update-files-with-release-version.sh ${{ steps.release-drafter.outputs.tag_name }}
 
+      # If using default Github token, the created pull request won't trigger workflows with pull_request event
+      # See https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#triggering-further-workflow-runs
+      - name: Generate Github token to create PR
+        uses: actions/create-github-app-token@v1
+        id: github-token
+        with:
+          app-id: ${{ secrets.ALMA_CREATE_TEAM_PRS_APP_ID }}
+          private-key: ${{ secrets.ALMA_CREATE_TEAM_PRS_APP_PEM }}
+          repositories: alma-woocommerce-gateway
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
+          token: ${{ steps.github-token.outputs.token }}
           commit-message: 'chore: update version'
           title: Release ${{ steps.release-drafter.outputs.tag_name }}
           body: |