From 42582f91d4b820eb7fe3c56b677c214d9d129c53 Mon Sep 17 00:00:00 2001
From: "Colin B. Macdonald" <cbm@m.fsf.org>
Date: Sun, 3 Jul 2022 15:50:28 -0700
Subject: [PATCH] Run bist and doctests in same job

This will slow down each job by a couple of minutes but will decrease
overall number of jobs.
---
 .github/workflows/main.yml | 50 ++++----------------------------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fade9a806..253a450e2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,11 +45,11 @@ jobs:
           docker run --rm -v $PWD:/home/jovyan:rw gnuoctave/octave:6.4.0 octave-cli --eval "x=sym('x'); test @sym/qr"
 
 
-  # Built-in Self Tests for various supported Octave and SymPy
+  # Built-in Self Tests and Doctests for various supported Octave and SymPy
   # Test newest Octave and all supported SymPy
   # Test other supported Octave releases with latest available SymPy
   # Note that 1.10.1 not supported on Python 3.6 (Ubuntu 18.04-based systems)
-  bist:
+  bist_doc:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: true
@@ -90,8 +90,11 @@ jobs:
           docker exec oc      git config --global --add safe.directory /home/jovyan/octsympy
           docker exec oc pip3 install packaging
           docker exec oc pip3 install sympy==$SYMPY
+          docker exec oc octave-cli --eval "pkg install -forge doctest"
       - name: Run BIST in-place
         run: docker exec oc make -C octsympy test
+      - name: Run doctests in-place
+        run: docker exec oc make -C octsympy doctest
       - name: Make package, then install-load-unload-uninstall
         run: |
           docker exec oc make -C octsympy install
@@ -102,49 +105,6 @@ jobs:
           docker rm oc
 
 
-  # note sympy 1.10 doesn't support Python 3.6 so won't work on 5.1.0/5.2.0
-  doctests:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        octave: [7.1.0]
-        sympy: [1.4, 1.5.1, 1.6.2, 1.7.1, 1.8, 1.9, 1.10.1]
-        include:
-          - octave: 5.1.0
-            sympy: 1.8
-          - octave: 6.4.0
-            sympy: 1.10.1
-    steps:
-      - uses: actions/checkout@v2
-      - name: Container setup
-        env:
-          OCT: ${{ matrix.octave }}
-          SYMPY: ${{ matrix.sympy }}
-        run: |
-          sudo uname -a
-          docker pull docker.io/gnuoctave/octave:$OCT
-          # TODO: nonsense here to try to get r/w access: enables sudo below
-          docker run --name=oc --detach --init \
-            -u root --env="GRANT_SUDO=yes" \
-            --volume=$PWD:/home/jovyan/octsympy:rw \
-            gnuoctave/octave:$OCT sleep inf
-          # FIXME: workaround "fatal: unsafe repository" error
-          # For more details, see https://stackoverflow.com/q/71901632
-          # and https://github.com/actions/checkout/issues/760
-          docker exec oc sudo git config --global --add safe.directory /home/jovyan/octsympy
-          docker exec oc      git config --global --add safe.directory /home/jovyan/octsympy
-          docker exec oc pip3 install packaging
-          docker exec oc pip3 install sympy==$SYMPY
-          docker exec oc octave-cli --eval "pkg install -forge doctest"
-      - name: Run doctests in-place
-        run: docker exec oc make -C octsympy doctest
-      - name: Stop container
-        run: |
-          docker stop oc
-          docker rm oc
-
-
   # Built-in Self Tests and Doctests using the Pythonic interface
   # Currently, we only test the newest Octave and SymPy since the support for
   # the Pythonic interface is experimental. We may change this in the future.