From 9ed8f3fb5f6558de2ef96c8890acb7ab07d6186d Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Fri, 27 Mar 2026 20:37:05 +0000 Subject: [PATCH 1/2] fix: pin Lua version on 5.4 --- .github/workflows/ci.yml | 3 ++- .github/workflows/ci_new.yml | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6895b825d..9b8af93b6d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -99,13 +99,14 @@ jobs: libtool \ yajl \ lmdb \ - lua \ + lua@5.4 \ libmaxminddb \ libxml2 \ ssdeep \ pcre \ bison \ flex + echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH - uses: actions/checkout@v4 with: submodules: true diff --git a/.github/workflows/ci_new.yml b/.github/workflows/ci_new.yml index 27020ae6ab..e662234c57 100644 --- a/.github/workflows/ci_new.yml +++ b/.github/workflows/ci_new.yml @@ -100,7 +100,7 @@ jobs: with: fetch-depth: 0 submodules: recursive - + - name: Install dependencies # curl and pcre2 are typically already available in the macOS runner image run: | @@ -109,14 +109,14 @@ jobs: libtool \ yajl \ lmdb \ - lua \ + lua@5.4 \ libmaxminddb \ libxml2 \ ssdeep \ pcre \ bison \ flex - + echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH - name: Run build preparation script run: ./build.sh @@ -206,7 +206,8 @@ jobs: - name: Install cppcheck run: | - brew install autoconf automake libtool cppcheck libmaxminddb yajl lua lmdb ssdeep + brew install autoconf automake libtool cppcheck libmaxminddb yajl lua@5.4 lmdb ssdeep + echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH - name: Configure project run: | From 1a833380f38f473bff32063bfa6dfc1708b2d9e5 Mon Sep 17 00:00:00 2001 From: Felipe Zipitria Date: Fri, 27 Mar 2026 19:49:24 -0300 Subject: [PATCH 2/2] refactor: use LUA_VERSION env variable for consistent Lua version across all jobs Pin Lua to 5.4 via a single workflow-level env variable instead of hardcoding the version in each job. This also aligns Linux jobs (previously on 5.2) with macOS jobs (5.4). --- .github/workflows/ci.yml | 9 ++++++--- .github/workflows/ci_new.yml | 15 +++++++++------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b8af93b6d..8bf7bf171b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,6 +4,9 @@ on: push: pull_request: +env: + LUA_VERSION: "5.4" + jobs: build-linux: name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }}) @@ -40,7 +43,7 @@ jobs: sudo apt-get install -y libyajl-dev:${{ matrix.platform.arch }} \ libcurl4-openssl-dev:${{ matrix.platform.arch }} \ liblmdb-dev:${{ matrix.platform.arch }} \ - liblua5.2-dev:${{ matrix.platform.arch }} \ + liblua${{ env.LUA_VERSION }}-dev:${{ matrix.platform.arch }} \ libmaxminddb-dev:${{ matrix.platform.arch }} \ libpcre2-dev:${{ matrix.platform.arch }} \ pcre2-utils:${{ matrix.platform.arch }} \ @@ -99,14 +102,14 @@ jobs: libtool \ yajl \ lmdb \ - lua@5.4 \ + lua@${{ env.LUA_VERSION }} \ libmaxminddb \ libxml2 \ ssdeep \ pcre \ bison \ flex - echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH + echo "/usr/local/opt/lua@${{ env.LUA_VERSION }}/bin" >> $GITHUB_PATH - uses: actions/checkout@v4 with: submodules: true diff --git a/.github/workflows/ci_new.yml b/.github/workflows/ci_new.yml index e662234c57..c8865fc36e 100644 --- a/.github/workflows/ci_new.yml +++ b/.github/workflows/ci_new.yml @@ -4,6 +4,9 @@ on: push: pull_request: +env: + LUA_VERSION: "5.4" + jobs: build-linux: name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }}) @@ -47,7 +50,7 @@ jobs: libyajl-dev \ libcurl4-openssl-dev \ liblmdb-dev \ - liblua5.2-dev \ + liblua${{ env.LUA_VERSION }}-dev \ libmaxminddb-dev \ libpcre2-dev \ libxml2-dev \ @@ -109,14 +112,14 @@ jobs: libtool \ yajl \ lmdb \ - lua@5.4 \ + lua@${{ env.LUA_VERSION }} \ libmaxminddb \ libxml2 \ ssdeep \ pcre \ bison \ flex - echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH + echo "/usr/local/opt/lua@${{ env.LUA_VERSION }}/bin" >> $GITHUB_PATH - name: Run build preparation script run: ./build.sh @@ -206,8 +209,8 @@ jobs: - name: Install cppcheck run: | - brew install autoconf automake libtool cppcheck libmaxminddb yajl lua@5.4 lmdb ssdeep - echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH + brew install autoconf automake libtool cppcheck libmaxminddb yajl lua@${{ env.LUA_VERSION }} lmdb ssdeep + echo "/usr/local/opt/lua@${{ env.LUA_VERSION }}/bin" >> $GITHUB_PATH - name: Configure project run: | @@ -250,7 +253,7 @@ jobs: libyajl-dev \ libcurl4-openssl-dev \ liblmdb-dev \ - liblua5.2-dev \ + liblua${{ env.LUA_VERSION }}-dev \ libmaxminddb-dev \ libpcre2-dev \ libxml2-dev \