ci: require test job success before auto-merge & cleanup

camptocamp · Sep 5, 2024 · 70dd3f0 · 70dd3f0
1 parent 0fc19a2
commit 70dd3f0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/.github/workflows/dependabot_pr.yml b/.github/workflows/dependabot_pr.yml
@@ -6,9 +6,13 @@ on:
       - opened
 
 jobs:
+  tests:
+    if: ${{ github.actor == 'dependabot[bot]' && github.event.label.name == 'dependencies' }}
+    uses: ./.github/workflows/tests.yml
   dependabot:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' && github.event.label.name == 'dependencies' }}
+    needs: [tests]
 
     steps:
       - name: Dependabot metadata

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,9 +5,6 @@ on:
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
 
-env:
-  HAS_SECRETS: ${{ secrets.HAS_SECRETS }}
-
 jobs:
   tests:
     name: Release new Docker Image in GHCR
@@ -24,13 +21,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Initialise gopass
-        uses: camptocamp/initialise-gopass-summon-action@v2
-        with:
-          ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
-          github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
-        if: env.HAS_SECRETS == 'HAS_SECRETS'
-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -3,9 +3,7 @@ name: Python unit tests
 on:
   push:
   pull_request:
-
-env:
-  HAS_SECRETS: ${{ secrets.HAS_SECRETS }}
+  workflow_call:
 
 jobs:
   tests:
@@ -23,13 +21,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Initialise gopass
-        uses: camptocamp/initialise-gopass-summon-action@v2
-        with:
-          ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
-          github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
-        if: env.HAS_SECRETS == 'HAS_SECRETS'
-
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with: