fix: update PR to enable automerge after realease setup

bcgov · Sep 19, 2024 · 8797ec8 · 8797ec8
1 parent b3173bf
commit 8797ec8
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/.github/workflows/release-process.yaml b/.github/workflows/release-process.yaml
@@ -94,17 +94,17 @@ jobs:
       - name: dev env setup
         if: steps.checkbox.outputs.result == 'true' && steps.up_to_date.outputs.result == 'true' && steps.pr_approval.outputs.result == 'true' && !github.event.pull_request.draft
         uses: ./.github/actions/dev-env-setup
-      - name: Setup Sqitch User
-        if: steps.checkbox.outputs.result == 'true' && steps.up_to_date.outputs.result == 'true' && steps.pr_approval.outputs.result == 'true' && !github.event.pull_request.draft
-        run: |
-          sqitch config --user user.name 'CCBC Service Account'
-          sqitch config --user user.email 'ccbc@button.is'
-      - name: Make Release
-        if: steps.checkbox.outputs.result == 'true' && steps.up_to_date.outputs.result == 'true' && steps.pr_approval.outputs.result == 'true' && !github.event.pull_request.draft
-        run: |
-          yarn
-          git checkout "${GITHUB_HEAD_REF}"
-          yarn run release-it --ci --branch="${GITHUB_HEAD_REF}" --git.commitArgs=-n
+      # - name: Setup Sqitch User
+      #   if: steps.checkbox.outputs.result == 'true' && steps.up_to_date.outputs.result == 'true' && steps.pr_approval.outputs.result == 'true' && !github.event.pull_request.draft
+      #   run: |
+      #     sqitch config --user user.name 'CCBC Service Account'
+      #     sqitch config --user user.email 'ccbc@button.is'
+      # - name: Make Release
+      #   if: steps.checkbox.outputs.result == 'true' && steps.up_to_date.outputs.result == 'true' && steps.pr_approval.outputs.result == 'true' && !github.event.pull_request.draft
+      #   run: |
+      #     yarn
+      #     git checkout "${GITHUB_HEAD_REF}"
+      #     yarn run release-it --ci --branch="${GITHUB_HEAD_REF}" --git.commitArgs=-n
       - name: Uncheck the checkbox
         if: steps.checkbox.outputs.result == 'true' && steps.up_to_date.outputs.result == 'true' && steps.pr_approval.outputs.result == 'true' && !github.event.pull_request.draft
         uses: actions/github-script@v7
@@ -125,3 +125,8 @@ jobs:
               pull_number: prNumber,
               body: updatedBody
             });
+            await github.rest.pulls.enableAutoMerge({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber
+            });