Skip to content

Commit 1a83338

Browse files
committed
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).
1 parent 9ed8f3f commit 1a83338

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
pull_request:
66

7+
env:
8+
LUA_VERSION: "5.4"
9+
710
jobs:
811
build-linux:
912
name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }})
@@ -40,7 +43,7 @@ jobs:
4043
sudo apt-get install -y libyajl-dev:${{ matrix.platform.arch }} \
4144
libcurl4-openssl-dev:${{ matrix.platform.arch }} \
4245
liblmdb-dev:${{ matrix.platform.arch }} \
43-
liblua5.2-dev:${{ matrix.platform.arch }} \
46+
liblua${{ env.LUA_VERSION }}-dev:${{ matrix.platform.arch }} \
4447
libmaxminddb-dev:${{ matrix.platform.arch }} \
4548
libpcre2-dev:${{ matrix.platform.arch }} \
4649
pcre2-utils:${{ matrix.platform.arch }} \
@@ -99,14 +102,14 @@ jobs:
99102
libtool \
100103
yajl \
101104
lmdb \
102-
lua@5.4 \
105+
lua@${{ env.LUA_VERSION }} \
103106
libmaxminddb \
104107
libxml2 \
105108
ssdeep \
106109
pcre \
107110
bison \
108111
flex
109-
echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH
112+
echo "/usr/local/opt/lua@${{ env.LUA_VERSION }}/bin" >> $GITHUB_PATH
110113
- uses: actions/checkout@v4
111114
with:
112115
submodules: true

.github/workflows/ci_new.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
pull_request:
66

7+
env:
8+
LUA_VERSION: "5.4"
9+
710
jobs:
811
build-linux:
912
name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }})
@@ -47,7 +50,7 @@ jobs:
4750
libyajl-dev \
4851
libcurl4-openssl-dev \
4952
liblmdb-dev \
50-
liblua5.2-dev \
53+
liblua${{ env.LUA_VERSION }}-dev \
5154
libmaxminddb-dev \
5255
libpcre2-dev \
5356
libxml2-dev \
@@ -109,14 +112,14 @@ jobs:
109112
libtool \
110113
yajl \
111114
lmdb \
112-
lua@5.4 \
115+
lua@${{ env.LUA_VERSION }} \
113116
libmaxminddb \
114117
libxml2 \
115118
ssdeep \
116119
pcre \
117120
bison \
118121
flex
119-
echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH
122+
echo "/usr/local/opt/lua@${{ env.LUA_VERSION }}/bin" >> $GITHUB_PATH
120123
- name: Run build preparation script
121124
run: ./build.sh
122125

@@ -206,8 +209,8 @@ jobs:
206209

207210
- name: Install cppcheck
208211
run: |
209-
brew install autoconf automake libtool cppcheck libmaxminddb yajl lua@5.4 lmdb ssdeep
210-
echo "/usr/local/opt/lua@5.4/bin" >> $GITHUB_PATH
212+
brew install autoconf automake libtool cppcheck libmaxminddb yajl lua@${{ env.LUA_VERSION }} lmdb ssdeep
213+
echo "/usr/local/opt/lua@${{ env.LUA_VERSION }}/bin" >> $GITHUB_PATH
211214
212215
- name: Configure project
213216
run: |
@@ -250,7 +253,7 @@ jobs:
250253
libyajl-dev \
251254
libcurl4-openssl-dev \
252255
liblmdb-dev \
253-
liblua5.2-dev \
256+
liblua${{ env.LUA_VERSION }}-dev \
254257
libmaxminddb-dev \
255258
libpcre2-dev \
256259
libxml2-dev \

0 commit comments

Comments
 (0)