Merge branch 'ci-allow-pr-to-checkout-non-develop-core-branch'

mysociety · Oct 26, 2023 · b8c3939 · b8c3939
2 parents b43496f + 39228dd
commit b8c3939
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches: [master, develop]
   pull_request:
-  workflow_call:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -40,13 +39,29 @@ jobs:
     env:
       DATABASE_URL: postgres://postgres:postgres@localhost:5432/alaveteli_test
       RAILS_ENV: test
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
+    - name: Extract associated required Alaveteli PR number
+      id: pr_alaveteli_number
+      run: |
+        PR_DESCRIPTION=$(gh pr view https://github.com/mysociety/whatdotheyknow-theme/pull/${{ github.event.pull_request.number }} --json body -q '.body')
+        echo "PR_ALAVETELI_NUMBER=$(echo $PR_DESCRIPTION | grep -o 'https://github.com/mysociety/alaveteli/pull/[0-9]*' | grep -o '[0-9]*$')" >> $GITHUB_ENV
+
+    - name: Get Alaveteli branch name
+      id: pr_alaveteli_branch
+      run: |
+        if [[ ! -z "$PR_ALAVETELI_NUMBER" ]]; then
+          echo "PR_ALAVETELI_BRANCH=$(gh pr view https://github.com/mysociety/alaveteli/pull/$PR_ALAVETELI_NUMBER --json headRefName -q '.headRefName')" >> $GITHUB_ENV
+        else
+          echo "PR_ALAVETELI_BRANCH=develop" >> $GITHUB_ENV
+        fi
+
     - name: Checkout Alaveteli
       uses: actions/checkout@v2
       with:
         repository: mysociety/alaveteli
-        ref: develop
+        ref: ${{ env.PR_ALAVETELI_BRANCH }}
         path: core
         submodules: true
         fetch-depth: 0

diff --git a/.github/workflows/mirror.yml b/.github/workflows/mirror.yml
@@ -5,18 +5,13 @@
 name: Mirror to git.mysociety.org
 
 on:
-  push:
+  workflow_run:
+    workflows: [CI]
+    types:
+      - completed
 
 jobs:
-
-  ci:
-    uses: ./.github/workflows/ci.yml
-
-  rubocop:
-    uses: ./.github/workflows/rubocop.yml
-
   mirror:
-    needs: [ci, rubocop]
     runs-on: ubuntu-latest
     steps:
 

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -1,6 +1,7 @@
 name: RuboCop
 
-on: [pull_request, workflow_call]
+on:
+  pull_request:
 
 permissions:
   contents: read