From 206cb297178ff46b4c5e5de38744cd648dac4f22 Mon Sep 17 00:00:00 2001
From: leaf corcoran <leafot@gmail.com>
Date: Sun, 22 Sep 2019 09:50:09 -0700
Subject: cmake doesn't support finding luajit, so skip it

---
 .github/workflows/test.yml |  8 +++++---
 runtests.sh                | 24 +++++++++++++++---------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 395e380..c0fd8ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,9 +10,11 @@ jobs:
         luaVersion: ["5.1", "5.2", "5.3", "luajit", "luajit-openresty"]
         include:
           - luaVersion: "luajit"
-            luaIncludeDir: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestEnv: "SKIP_CMAKE=1"
           - luaVersion: "luajit-openresty"
-            luaIncludeDir: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestArgs: "LUA_INCLUDE_DIR=.lua/include/luajit-2.1"
+            runtestEnv: "SKIP_CMAKE=1"
 
     runs-on: ubuntu-latest
 
@@ -27,7 +29,7 @@ jobs:
 
     - name: test
       run: |
-        LUA_DIR=.lua ./runtests.sh PREFIX=.lua ${{ matrix.luaIncludeDir }}
+        LUA_DIR=.lua ${{ matrix.runtestEnv }} ./runtests.sh PREFIX=.lua ${{ matrix.runtestArgs }}
 
     - name: build
       run: |
diff --git a/runtests.sh b/runtests.sh
index bfb01d9..fe606fa 100755
--- a/runtests.sh
+++ b/runtests.sh
@@ -56,14 +56,20 @@ do_tests
 make clean
 rm -rf tests/cjson{,.so}
 
-echo "===== Testing Cmake build ====="
-mkdir build
-cd build
-cmake ..
-make
-cd ..
-cp -r lua/cjson build/cjson.so tests
-do_tests
-rm -rf build tests/cjson{,.so}
+
+if [ -z "$SKIP_CMAKE" ]; then
+    echo "===== Testing Cmake build ====="
+    mkdir build
+    cd build
+    cmake ..
+    make
+    cd ..
+    cp -r lua/cjson build/cjson.so tests
+    do_tests
+    rm -rf build tests/cjson{,.so}
+else
+    echo "===== Skipping Cmake build ====="
+fi
+
 
 # vi:ai et sw=4 ts=4:
-- 
cgit v1.2.3-55-g6feb