Skip to content

Commit 582d04e

Browse files
Easton97-Jensjens
authored andcommitted
Update ci.yml
1 parent 44a9dda commit 582d04e

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

.github/workflows/ci.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@ name: Quality Assurance
33
on:
44
push:
55
pull_request:
6+
7+
env:
8+
LUA_VERSION: "5.5"
69

710
jobs:
811
build-linux:
912
name: Linux (${{ matrix.platform.label }}, ${{ matrix.compiler.label }}, ${{ matrix.configure.label }})
1013
runs-on: ${{ matrix.os }}
1114
strategy:
15+
fail-fast: false
1216
matrix:
1317
os: [ubuntu-22.04]
1418
platform:
@@ -40,7 +44,7 @@ jobs:
4044
sudo apt-get install -y libyajl-dev:${{ matrix.platform.arch }} \
4145
libcurl4-openssl-dev:${{ matrix.platform.arch }} \
4246
liblmdb-dev:${{ matrix.platform.arch }} \
43-
liblua5.2-dev:${{ matrix.platform.arch }} \
47+
liblua${{ env.LUA_VERSION }}-dev:${{ matrix.platform.arch }} \
4448
libmaxminddb-dev:${{ matrix.platform.arch }} \
4549
libpcre2-dev:${{ matrix.platform.arch }} \
4650
pcre2-utils:${{ matrix.platform.arch }} \
@@ -56,9 +60,9 @@ jobs:
5660
run: |
5761
sudo apt-get install -y libgeoip-dev:${{ matrix.platform.arch }} \
5862
libfuzzy-dev:${{ matrix.platform.arch }}
59-
- uses: actions/checkout@v4
63+
- uses: actions/checkout@v6
6064
with:
61-
submodules: true
65+
submodules: recursive
6266
fetch-depth: 0
6367
- name: build.sh
6468
run: ./build.sh
@@ -77,6 +81,7 @@ jobs:
7781
name: macOS (${{ matrix.configure.label }})
7882
runs-on: ${{ matrix.os }}
7983
strategy:
84+
fail-fast: false
8085
matrix:
8186
os: [macos-14]
8287
configure:
@@ -99,16 +104,16 @@ jobs:
99104
libtool \
100105
yajl \
101106
lmdb \
102-
lua \
107+
lua@${{ env.LUA_VERSION }} \
103108
libmaxminddb \
104109
libxml2 \
105110
ssdeep \
106111
pcre \
107112
bison \
108113
flex
109-
- uses: actions/checkout@v4
114+
- uses: actions/checkout@v6
110115
with:
111-
submodules: true
116+
submodules: recursive
112117
fetch-depth: 0
113118
- name: Build GeoIP
114119
run: |
@@ -134,6 +139,7 @@ jobs:
134139
name: Windows (${{ matrix.platform.label }}, ${{ matrix.configure.label }})
135140
runs-on: ${{ matrix.os }}
136141
strategy:
142+
fail-fast: false
137143
matrix:
138144
os: [windows-2022]
139145
platform:
@@ -147,9 +153,9 @@ jobs:
147153
- {label: "wo libxml", opt: "-DWITH_LIBXML2=OFF" }
148154
- {label: "with lmdb", opt: "-DWITH_LMDB=ON" }
149155
steps:
150-
- uses: actions/checkout@v4
156+
- uses: actions/checkout@v6
151157
with:
152-
submodules: true
158+
submodules: recursive
153159
fetch-depth: 0
154160
- name: Install Conan
155161
run: |
@@ -197,7 +203,7 @@ jobs:
197203
cppcheck
198204
- uses: actions/checkout@v4
199205
with:
200-
submodules: true
206+
submodules: recursive
201207
fetch-depth: 0
202208
- name: configure
203209
run: |

0 commit comments

Comments
 (0)