From d897d6a00c2d41a53d34dd5dab6dd07d8822d39b Mon Sep 17 00:00:00 2001
From: Chris Pyles <cpyles@berkeley.edu>
Date: Sun, 1 Sep 2024 17:21:18 -0700
Subject: [PATCH] separate master and beta docker tests into separate workflows

---
 .github/workflows/run-docker-tests-beta.yml | 100 ++++++++++++++++++++
 .github/workflows/run-docker-tests.yml      |  22 -----
 2 files changed, 100 insertions(+), 22 deletions(-)
 create mode 100644 .github/workflows/run-docker-tests-beta.yml

diff --git a/.github/workflows/run-docker-tests-beta.yml b/.github/workflows/run-docker-tests-beta.yml
new file mode 100644
index 00000000..091ee269
--- /dev/null
+++ b/.github/workflows/run-docker-tests-beta.yml
@@ -0,0 +1,100 @@
+# Workflow for running the test suite including long-running tests using Docker
+
+name: Run Docker tests (beta)
+
+on:
+  workflow_run:
+    workflows: [Run Docker tests]
+    types:
+      - requested
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Test suite
+    runs-on: ubuntu-latest
+
+    env:
+      TAR: /bin/tar
+      DOCKER_BUILDKIT: 1
+      DOCKER_CLI_EXPERIMENTAL: enabled
+
+    defaults:
+      run:
+        shell: bash -l {0}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Fetch origin
+        run: |
+          git fetch origin
+
+      - name: Check that branch exists
+        id: check-branch
+        run: |
+          if git show-ref --quiet refs/remotes/origin/beta; then
+            echo "run=true" > $GITHUB_OUTPUT
+          else
+            echo "run=false" > $GITHUB_OUTPUT
+          fi
+
+      - uses: actions/checkout@v4
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        with:
+          ref: beta
+
+      - uses: docker/setup-buildx-action@v2
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        with:
+          install: true
+
+      - uses: r-lib/actions/setup-tinytex@v2
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+
+      - uses: r-lib/actions/setup-pandoc@v2
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+
+      - uses: liskin/gh-pipx@v1
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        with:
+          packages: >-
+            poetry
+
+      - uses: mamba-org/setup-micromamba@v1
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        with:
+          environment-file: environment.yml
+          init-shell: >-
+            bash
+          cache-environment: true
+          cache-environment-key: requirements-${{ hashFiles('pyproject.toml') }}
+
+      - name: Install dependencies
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        run: |
+          micromamba activate otter-grader
+          poetry install --with test --all-extras
+
+      - name: Install ottr
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        run: |
+          micromamba run -n otter-grader Rscript -e 'install.packages("ottr", dependencies=TRUE, repos="https://cran.r-project.org/")'
+
+      - name: Maximize build space
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        run: |
+          sudo swapoff -a
+          sudo rm -f /swapfile
+          sudo apt clean
+          df -h
+
+      - name: Run tests
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        run: |
+          micromamba activate otter-grader
+          make testcov PYTESTOPTS="-vv" && coverage lcov -i
+
+      - name: Coveralls
+        if: ${{ steps.check-branch.outputs.run == 'true' }}
+        uses: coverallsapp/github-action@v2
diff --git a/.github/workflows/run-docker-tests.yml b/.github/workflows/run-docker-tests.yml
index 903ce997..ad8d0027 100644
--- a/.github/workflows/run-docker-tests.yml
+++ b/.github/workflows/run-docker-tests.yml
@@ -13,10 +13,6 @@ jobs:
     name: Test suite
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        branch: [master, beta]
-
     env:
       TAR: /bin/tar
       DOCKER_BUILDKIT: 1
@@ -33,33 +29,19 @@ jobs:
         run: |
           git fetch origin
 
-      - name: Check that branch exists
-        id: check-branch
-        run: |
-          if git show-ref --quiet refs/remotes/origin/${{ matrix.branch }}; then
-            echo "run=true" > $GITHUB_OUTPUT
-          else
-            echo "run=false" > $GITHUB_OUTPUT
-          fi
-
       - uses: actions/checkout@v4
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         with:
           ref: ${{ matrix.branch }}
 
       - uses: docker/setup-buildx-action@v2
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         with:
           install: true
 
       - uses: r-lib/actions/setup-tinytex@v2
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
 
       - uses: r-lib/actions/setup-pandoc@v2
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
 
       - uses: mamba-org/setup-micromamba@v1
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         with:
           environment-file: environment.yml
           init-shell: >-
@@ -68,12 +50,10 @@ jobs:
           cache-environment-key: requirements-${{ hashFiles('requirements*.txt') }}
 
       - name: Install ottr
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         run: |
           micromamba run -n otter-grader Rscript -e 'install.packages("ottr", dependencies=TRUE, repos="https://cran.r-project.org/")'
 
       - name: Maximize build space
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         run: |
           sudo swapoff -a
           sudo rm -f /swapfile
@@ -81,11 +61,9 @@ jobs:
           df -h
 
       - name: Run tests
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         run: |
           micromamba activate otter-grader
           make testcov PYTESTOPTS="-vv" && coverage lcov -i
 
       - name: Coveralls
-        if: ${{ steps.check-branch.outputs.run == 'true' }}
         uses: coverallsapp/github-action@v2