Merge pull request #306 from boxuk/BWP-122

[BWP-122] Triggering the Test Workflows

Author: James Amner

.github/checkout-deps-auto-update/action.yml

@@ -0,0 +1,45 @@
+name: Checkout WP Deps Branch
+description: Checkout a branch for the WP Deps update action
+
+# Based on example https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#using-data-from-the-triggering-workflow
+
+runs:
+  using: composite
+  steps:
+    - name: 'Download artifact'
+      uses: actions/github-script@v6
+      with:
+        script: |
+          let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            run_id: context.payload.workflow_run.id,
+          });
+          let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
+            return artifact.name == "pr_number"
+          })[0];
+          let download = await github.rest.actions.downloadArtifact({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            artifact_id: matchArtifact.id,
+            archive_format: 'zip',
+          });
+          const fs = require('fs');
+          const path = require('path');
+          const temp = '${{ runner.temp }}/artifacts';
+          if (!fs.existsSync(temp)){
+            fs.mkdirSync(temp);
+          }
+          fs.writeFileSync(path.join(temp, 'pr_number.zip'), Buffer.from(download.data));
+
+    - name: Parse PR Number
+      shell: bash
+      id: parse-pr-number
+      run: |
+        unzip pr_number.zip -d "${{ runner.temp }}/artifacts"
+        echo "PR_NUMBER=$(cat ${{ runner.temp }}/artifacts/pr/pr_number)" >> $GITHUB_ENV
+
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        ref: refs/pull/${{ steps.parse-pr-number.outputs.PR_NUMBER }}/merge

.github/workflows/test-php.yml

@@ -33,14 +33,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-        if: github.event_name == 'pull_request'
+        if: github.event_name != 'workflow_run'
+
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.workflow_run.head_sha }}
+        uses: ./.github/checkout-deps-auto-update
         if: github.event_name == 'workflow_run'
+
       - name: Set up PHP
         uses: setup-php/setup-php@v2
         with:

.github/workflows/tests-js.yml

@@ -26,21 +26,20 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-        if: github.event_name == 'pull_request'
+        if: github.event_name != 'workflow_run'
+
       - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.workflow_run.head_sha }}
+        uses: ./.github/checkout-deps-auto-update
         if: github.event_name == 'workflow_run'
+
       - name: Setup Node
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: npm
       - name: Setup dependencies
         run: npm ci
+
       - name: Lint JS
         run: npm run lint
       - name: Unit Test

.github/workflows/wordpress-deps.yml

@@ -19,7 +19,18 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
       - name: Run Update
+        id: update
         uses: 'boxuk/wp-deps-auto-update@main'
         with:
           WP_VERSION: ${{ env.WORDPRESS_VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Save PR number
+        env:
+          PR_NUMBER: ${{ steps.update.outputs.pull-request-number }}
+        run: |
+            mkdir -p ./pr
+            echo $PR_NUMBER > ./pr/pr_number
+      - uses: actions/upload-artifact@v4
+        with:
+          name: pr_number
+          path: pr/

packages/deps-auto-update/action.yml

@@ -7,6 +7,24 @@ inputs:
   GITHUB_TOKEN:
     description: 'GitHub Token'
     required: true
+
+outputs:
+  pull-request-number:
+    description: 'The pull request number'
+    value: ${{ steps.create-pull-request.outputs.pull-request-number }}
+  pull-request-url:
+    description: 'The URL of the pull request.'
+    value: ${{ steps.create-pull-request.outputs.pull-request-url }}
+  pull-request-operation:
+    description: 'The pull request operation performed by the action, `created`, `updated` or `closed`.'
+    value: ${{ steps.create-pull-request.outputs.pull-request-operation }}
+  pull-request-head-sha:
+    description: 'The commit SHA of the pull request branch.'
+    value: ${{ steps.create-pull-request.outputs.pull-request-head-sha }}
+  pull-request-branch:
+    description: 'The pull request branch name'
+    value: ${{ steps.create-pull-request.outputs.pull-request-branch }}
+
 runs:
   using: composite
   steps:
@@ -33,6 +51,7 @@ runs:
 
     # Create a PR
     - name: Create Pull Request
+      id: create-pull-request
       uses: peter-evans/create-pull-request@v7
       with: 
         title: "[DEPS] Update WP Packages for WP ${{ inputs.WP_VERSION }}"