Fixing test/merge workflow

Author: distantcam

.github/workflows/build.yml

@@ -3,49 +3,20 @@ name: 🛠️ build
 on:
   workflow_dispatch:
   push:
+    branches:
+      - main
     tags:
       - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+-**"
 
 jobs:
   test:
     name: 🧪 Run tests
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        roslyn: ["3.11", "4.0", "4.4"]
-    steps:
-      - name: 🛒 Check-out code
-        uses: actions/checkout@v4
-
-      - name: 📐 Setup .NET Core SDK
-        uses: actions/setup-dotnet@v4
-        with:
-          global-json-file: src/global.json
-
-      - name: 🔍 Enable problem matchers
-        run: echo "::add-matcher::.github/matchers/dotnet.json"
-
-      - name: 🛠️ Build code
-        run: dotnet build --configuration Release
-
-      - name: 🧪 Testing ${{ matrix.roslyn }} code
-        run: >
-          dotnet test
-          --configuration Release
-          -p:GeneratorVersion=${{ matrix.roslyn }}
-
-      - name: Upload Test Results
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: verify-test-results
-          path: |
-            **/*.received.*
+    uses: ./.github/workflows/test.yml
 
   build:
     name: 🛠️ Build
-    if: ${{ github.event_name == 'push' && github.ref_type == 'tag' }}
+    if: github.event_name == 'push' && github.ref_type == 'tag'
     runs-on: ubuntu-latest
     needs: test
     steps:

.github/workflows/pr.yml

@@ -0,0 +1,33 @@
+name: ✏️ pr
+
+on:
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+
+jobs:
+  test:
+    name: 🧪 Run tests
+    uses: ./.github/workflows/test.yml
+
+  merge:
+    name: 🤖 Merge
+    runs-on: ubuntu-latest
+    needs: test
+    if: |
+      github.event_name == 'pull_request'
+      && github.event.pull_request.user.login == 'dependabot[bot]'
+      && github.repository == 'distantcam/autoctor'
+    permissions:
+      pull-requests: write
+      contents: write
+    steps:
+      - name: 📡 Dependabot metadata
+        id: dependabot-metadata
+        uses: dependabot/fetch-metadata@v2
+
+      - name: ✔️ Merge PR
+        if: steps.dependabot-metadata.outputs.dependency-group == 'tunit'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -1,12 +1,7 @@
 name: 🧪 test
 
 on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-  pull_request:
-    types: [opened, reopened, edited, synchronize]
+  workflow_call:
 
 jobs:
   test:
@@ -43,27 +38,3 @@ jobs:
           name: verify-test-results
           path: |
             **/*.received.*
-
-  merge:
-    name: 🤖 Merge
-    runs-on: ubuntu-latest
-    if: |
-      github.event_name == 'pull_request'
-      && github.event.pull_request.user.login == 'dependabot[bot]'
-      && github.repository == 'distantcam/autoctor'
-    permissions:
-      pull-requests: write
-      contents: write
-    steps:
-      - name: 📡 Dependabot metadata
-        id: dependabot-metadata
-        uses: dependabot/fetch-metadata@v2
-
-      - name: ✔️ Merge PR
-        if: |
-          steps.dependabot-metadata.outputs.dependency-group == 'tunit'
-          && steps.dependabot-metadata.outputs.update-type == 'version-update:semver-patch'
-        run: gh pr merge --auto --merge "$PR_URL"
-        env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}