support forcing test runs

lenskit · Jul 2, 2024 · 9525e7d · 9525e7d
1 parent 053859e
commit 9525e7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 55 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,6 +28,9 @@ jobs:
               if gh pr diff $PR_NUMBER --name-only |grep '^lenskit.*\.py$'; then
                   echo "source code changed"
                   echo changed=yes >>"$GITHUB_OUTPUT"
+              elif gh pr view $PR_NUMBER --json body -t '{{.body}}' | grep 'tests: force'; then
+                  echo "test run forced from PR text"
+                  echo changed=yes >>"$GITHUB_OUTPUT"
               else
                   echo "source code unchanged"
                   echo changed=no >>"$GITHUB_OUTPUT"
@@ -37,10 +40,6 @@ jobs:
         env:
           GH_TOKEN: ${{ github.token }}
           PR_NUMBER: ${{ github.event.number }}
-      - name: Inspect outputs
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{steps.check-for-changes.outputs.changed}}
   conda:
     name: Conda Python ${{matrix.python}} on ${{matrix.platform}}
     runs-on: ${{matrix.platform}}
@@ -63,10 +62,6 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -126,10 +121,6 @@ jobs:
           - macos-latest
           - windows-latest
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -180,10 +171,6 @@ jobs:
       - check-changes
     if: needs.check-changes.outputs.changed == 'yes'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -237,10 +224,6 @@ jobs:
       - check-changes
     if: needs.check-changes.outputs.changed == 'yes'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -301,10 +284,6 @@ jobs:
           - '3.11'
           - '3.12'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -353,10 +332,6 @@ jobs:
       - check-changes
     if: needs.check-changes.outputs.changed == 'yes'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -417,10 +392,6 @@ jobs:
           - '3.11'
           - '3.12'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -469,10 +440,6 @@ jobs:
       - check-changes
     if: needs.check-changes.outputs.changed == 'yes'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -530,10 +497,6 @@ jobs:
           - '3.11'
           - '3.12'
     steps:
-      - name: dump test
-        run: echo "$CHANGED"
-        env:
-          CHANGED: ${{needs.check-changes-outputs.changed}}
       - name: 🛒 Checkout
         uses: actions/checkout@v4
         with:
@@ -584,7 +547,7 @@ jobs:
         shell: bash -el {0}
     needs:
       - check-changes
-    if: needs.check-changes.outputs.changed
+    if: needs.check-changes.outputs.changed == 'yes'
     steps:
       - name: 🛒 Checkout
         uses: actions/checkout@v4

diff --git a/lkdev/workflows/test.py b/lkdev/workflows/test.py
@@ -298,13 +298,7 @@ def test_job(options: JobOptions) -> GHJob:
         }
 
     job.update(job_strategy(options))  # type: ignore
-    job["steps"] = [
-        {
-            "name": "dump test",
-            "run": 'echo "$CHANGED"',
-            "env": {"CHANGED": "${{needs.check-changes-outputs.changed}}"},
-        }
-    ] + test_job_steps(options)
+    job["steps"] = test_job_steps(options)
     return job
 
 
@@ -322,7 +316,7 @@ def test_eval_job() -> GHJob:
         "runs-on": opts.vm_platform,
         "defaults": {"run": {"shell": "bash -el {0}"}},
         "needs": ["check-changes"],
-        "if": "needs.check-changes.outputs.changed",
+        "if": "needs.check-changes.outputs.changed == 'yes'",
         "steps": [step_checkout(opts)]
         + steps_setup_conda(opts)
         + steps_mldata(opts, ["ml-100k", "ml-20m"])
@@ -384,23 +378,21 @@ def job_check_changes() -> GHJob:
                         if gh pr diff $PR_NUMBER --name-only |grep '^lenskit.*\\.py$'; then
                             echo "source code changed"
                             echo changed=yes >>"$GITHUB_OUTPUT"
+                        elif gh pr view $PR_NUMBER --json body -t '{{.body}}' | grep 'tests: force'; then
+                            echo "test run forced from PR text"
+                            echo changed=yes >>"$GITHUB_OUTPUT"
                         else
                             echo "source code unchanged"
                             echo changed=no >>"$GITHUB_OUTPUT"
                         fi
                     fi
                     cat $GITHUB_OUTPUT
-                """),
+                """),  # noqa: E501
                 "env": {
                     "GH_TOKEN": "${{ github.token }}",
                     "PR_NUMBER": "${{ github.event.number }}",
                 },
             },
-            {
-                "name": "Inspect outputs",
-                "run": 'echo "$CHANGED"',
-                "env": {"CHANGED": "${{steps.check-for-changes.outputs.changed}}"},
-            },
         ],
     }