Test CMake's system Lua option in Docker CI

wesnoth · Feb 12, 2024 · f36e611 · f36e611
1 parent 69fa5c1
commit f36e611
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -51,8 +51,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { tool: scons, cc: gcc,   cxx: g++,     cfg: debug,   lto: false }
-          - { tool: cmake, cc: clang, cxx: clang++, cfg: release, lto: true  }
+          - { tool: scons, cc: gcc,   cxx: g++,     cfg: debug,   lto: false, sys_lua: false }
+          - { tool: cmake, cc: clang, cxx: clang++, cfg: release, lto: true,  sys_lua: true  }
     runs-on: ubuntu-latest
     container:
       image: wesnoth/wesnoth:2204-master
@@ -64,6 +64,7 @@ jobs:
         CXX: ${{ matrix.cxx }}
         CXX_STD: 17
         LTO: ${{ matrix.lto }}
+        SYS_LUA: ${{ matrix.sys_lua }}
         CLICOLOR_FORCE: 1
         SDL_VIDEODRIVER: dummy
 
@@ -83,8 +84,8 @@ jobs:
                 ldconfig
                 scons "$@" build="$CFG" ctool="$CC" cxxtool="$CXX" cxx_std="$CXX_STD" \
                   extra_flags_config="-pipe" forum_user_handler=true \
-                  nls=false enable_lto="$LTO" force_color=true jobs=2 --debug=time \
-                  glibcxx_debug=true glibcxx_assertions=true
+                  nls=false enable_lto="$LTO" system_lua="$SYS_LUA" force_color=true \
+                  jobs=2 --debug=time glibcxx_debug=true glibcxx_assertions=true
               }
               build strict=true wesnoth boost_unit_tests
 
@@ -97,7 +98,8 @@ jobs:
                 ldconfig
                 cmake "$@" -DCMAKE_BUILD_TYPE="$CFG" -DCXX_STD="$CXX_STD" \
                   -DEXTRA_FLAGS_CONFIG="-pipe" -DENABLE_MYSQL=true \
-                  -DENABLE_NLS=false -DENABLE_LTO="$LTO" -DFORCE_COLOR_OUTPUT=true -DLTO_JOBS=2 .
+                  -DENABLE_NLS=false -DENABLE_LTO="$LTO" -DFORCE_COLOR_OUTPUT=true -DLTO_JOBS=2 \
+                  -DENABLE_SYSTEM_LUA="$SYS_LUA" .
               }
               rm -R /usr/local/lib/cmake
               rm /usr/local/lib/libboost*

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -54,7 +54,7 @@ jobs:
           libboost-serialization1.74-dev libboost-locale1.74-dev libboost-regex1.74-dev libboost-random1.74-dev \
           libboost-program-options1.74-dev libboost-thread1.74-dev libboost-context1.74-dev libboost-test-dev \
           libboost-coroutine1.74-dev libasio-dev libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libvorbis-dev \
-          libpango1.0-dev libssl-dev libcurl4-openssl-dev
+          libpango1.0-dev libssl-dev libcurl4-openssl-dev liblua5.4-dev
     # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
     - name: Autobuild
       uses: github/codeql-action/autobuild@v3