From: Vsevolod Stakhov Date: Fri, 5 Dec 2025 11:31:40 +0000 (+0000) Subject: [CI] Use Lua 5.4 for Fedora, LuaJIT for Ubuntu X-Git-Tag: 3.14.2~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46759d04e3dbcad3c63e7f4615142b9a8ebe0af5;p=thirdparty%2Frspamd.git [CI] Use Lua 5.4 for Fedora, LuaJIT for Ubuntu This ensures we test both Lua implementations in CI: - Fedora: Lua 5.4 (ENABLE_LUAJIT=OFF) - Ubuntu: LuaJIT (ENABLE_LUAJIT=ON, default) --- diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c79a4696c..c29bdc43b8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: with: image: ghcr.io/rspamd/rspamd-build-docker:fedora-ci name: fedora-ci + enable_luajit: 'OFF' ubuntu_amd64: uses: ./.github/workflows/ci_rspamd.yml diff --git a/.github/workflows/ci_rspamd.yml b/.github/workflows/ci_rspamd.yml index 1486ea28df..4fc2a69d60 100644 --- a/.github/workflows/ci_rspamd.yml +++ b/.github/workflows/ci_rspamd.yml @@ -12,6 +12,9 @@ on: runner: type: string default: 'ubuntu-24.04' + enable_luajit: + type: string + default: 'ON' env: CTEST_OUTPUT_ON_FAILURE: 1 @@ -42,7 +45,7 @@ jobs: run: | mkdir ${GITHUB_WORKSPACE}/build cd ${GITHUB_WORKSPACE}/build - cmake -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_COVERAGE=ON -DENABLE_LIBUNWIND=ON -DENABLE_HYPERSCAN=ON ${{ env.HYPERSCAN_ALTROOT }} -GNinja ${GITHUB_WORKSPACE}/src + cmake -DCMAKE_INSTALL_PREFIX=${GITHUB_WORKSPACE}/install -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_COVERAGE=ON -DENABLE_LIBUNWIND=ON -DENABLE_HYPERSCAN=ON -DENABLE_LUAJIT=${{ inputs.enable_luajit }} ${{ env.HYPERSCAN_ALTROOT }} -GNinja ${GITHUB_WORKSPACE}/src - name: Build rspamd run: |