fix: prerelease + secu

SocialGouv · Apr 4, 2022 · b538366 · b538366
1 parent d6f13bf
commit b538366
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -27,8 +27,13 @@ jobs:
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
           FROM_BRANCH: "dev"
           TO_BRANCH: "master"
+      - name: Approve PR
+        run: gh pr review "$PR_URL" --approve
+        env:
+          PR_URL: ${{ steps.pull.outputs.PULL_REQUEST_URL }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Enable Automerge
-        run: gh pr merge --auto --rebase "$PR_URL"
+        run: gh pr merge "$PR_URL" --auto --rebase
         env:
           PR_URL: ${{ steps.pull.outputs.PULL_REQUEST_URL }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -8,6 +8,7 @@ concurrency:
 
 jobs:
   release:
+    if: github.ref == 'refs/heads/master'
     name: Release
     runs-on: ubuntu-latest
     steps: