From 206105bc3f9ebd96c82cd51a8ee40d0518a125b6 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Thu, 14 Oct 2021 19:56:30 +0100
Subject: [PATCH] GHA: Correctly unset SWIGJOBS for broken parallel language
 checks

---
 .github/workflows/ci.yml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32d5b53dc..4e3eb7f45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -215,19 +215,6 @@ jobs:
                   ;;
           esac
 
-          case "$SWIGLANG" in
-            javascript)
-              case "$ENGINE" in
-                v8 | jsc)
-                  # Running tests using v8 or jsc involves creating a custom
-                  # interpreter in Tools/javascript, which is currently broken
-                  # for parallel builds (we attempt to update this interpreter
-                  # while running, resulting in "Text file busy" error).
-                  unset SWIGJOBS
-              esac
-              ;;
-          esac
-
           if [[ $cpu_count != 1 ]]; then
             echo SWIGJOBS=-j$cpu_count >> $GITHUB_ENV
           fi
@@ -290,6 +277,19 @@ jobs:
           if test -z "$SWIGLANG"; then make $SWIGJOBS check-ccache; fi
           if test -z "$SWIGLANG"; then make $SWIGJOBS check-errors-test-suite; fi
 
+          case "$SWIGLANG" in
+            javascript)
+              case "$ENGINE" in
+                v8 | jsc)
+                  # Running tests using v8 or jsc involves creating a custom
+                  # interpreter in Tools/javascript, which is currently broken
+                  # for parallel builds (we attempt to update this interpreter
+                  # while running, resulting in "Text file busy" error).
+                  unset SWIGJOBS
+              esac
+              ;;
+          esac
+
           # Stricter compile flags for examples. Various headers and SWIG generated code prevents full use of -pedantic.
           if test -n "$SWIGLANG"; then cflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cflags --std=$CSTD --compiler=$CC) && echo $cflags; fi
           if test -n "$SWIGLANG"; then cxxflags=$($GITHUB_WORKSPACE/Tools/testflags.py --language $SWIGLANG --cxxflags --std=$CPPSTD --compiler=$CC) && echo $cxxflags; fi