GitHub Actions: Extract test-e2e.yml (#163)

Author: tangrufus

.github/workflows/deploy.yml

@@ -43,9 +43,9 @@ jobs:
       actions: write
     runs-on: ubuntu-24.04
     steps:
-      - name: Dispatch Test (e2e Production) Workflow
+      - name: Dispatch Test (Production) Workflow
         run: |
-          gh workflow run test-e2e-prod.yml \
+          gh workflow run test-prod.yml \
             --repo "${REPO}" \
             --ref "${REF}"
         env:

.github/workflows/test-e2e-prod.yml .github/workflows/test-e2e.yml.github/workflows/test-e2e-prod.yml renamed to .github/workflows/test-e2e.yml

@@ -1,13 +1,13 @@
-name: Test (e2e Production)
+name: Test (e2e)
 
 on:
+  workflow_call:
+    inputs: &inputs
+      url:
+        required: true
+        type: string
   workflow_dispatch:
-  schedule:
-    - cron: '34 6,18 * * *' # Twice a day, one hour after the Update Data workflow
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name }}
-  cancel-in-progress: true
+    inputs: *inputs
 
 permissions:
   contents: read
@@ -16,13 +16,9 @@ env:
   GOEXPERIMENT: jsonv2
 
 jobs:
-  e2e-test-prod:
+  test:
+    name: ${{ inputs.url || 'Local' }}
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        url: 
-          - 'https://repo-wpsecadv.typist.tech/'
-          - 'https://wpsecadv.fly.dev/'
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
@@ -34,4 +30,4 @@ jobs:
 
       - run: go test -tags=e2econtainer -count=1 -shuffle=on ./e2e/container/...
         env:
-          WPSECADV_SERVER_URL: ${{ matrix.url }}
+          WPSECADV_SERVER_URL: ${{ inputs.url }}

.github/workflows/test-prod.yml

@@ -0,0 +1,24 @@
+name: Test (Production)
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '34 6,18 * * *' # Twice a day, one hour after the Update Data workflow
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  e2e:
+    strategy:
+      matrix:
+        url:
+          - 'https://repo-wpsecadv.typist.tech/'
+          - 'https://wpsecadv.fly.dev/'
+    uses: ./.github/workflows/test-e2e.yml
+    with:
+      url: ${{ matrix.url }}

.github/workflows/test.yml

@@ -38,19 +38,11 @@ jobs:
           path: coverage.out
           if-no-files-found: error
 
-  e2e-test:
+  e2e:
     needs: test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          persist-credentials: false
-      - uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
-        with:
-          go-version-file: 'go.mod'
-      - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
-
-      - run: go test -tags=e2econtainer -count=1 -shuffle=on ./e2e/container/...
+    uses: ./.github/workflows/test-e2e.yml
+    with:
+      url: '' # Leave blank to boot a local server for testing
 
   codecov:
     needs: test
@@ -78,7 +70,7 @@ jobs:
     if: github.event_name == 'push' && github.ref_name == 'main'
     needs:
       - test
-      - e2e-test
+      - e2e
     permissions:
       actions: write
     runs-on: ubuntu-24.04