Skip to content

Commit f9d884c

Browse files
Refactor CI workflow and update dependencies
Updated CI workflow to use recursive submodules and changed container from debian:sid to debian:trixie. Removed GeoIP library build steps and unnecessary dependencies.
1 parent 9d88665 commit f9d884c

1 file changed

Lines changed: 11 additions & 41 deletions

File tree

.github/workflows/ci_new.yml

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,12 @@ jobs:
3232
- { label: "without ssdeep", opt: "--without-ssdeep" }
3333
- { label: "with lmdb", opt: "--with-lmdb" }
3434
- { label: "with pcre2 (default)", opt: "" }
35-
- { label: "with pcre", opt: "--with-pcre" }
3635

3736
steps:
3837
- uses: actions/checkout@v6
3938
with:
4039
fetch-depth: 0
41-
submodules: true
42-
43-
- name: Ensure submodules are fully initialized (recursive)
44-
run: git submodule update --init --recursive
40+
submodules: recursive
4541

4642
- name: Install dependencies
4743
run: |
@@ -53,8 +49,6 @@ jobs:
5349
liblua5.2-dev \
5450
libmaxminddb-dev \
5551
libpcre2-dev \
56-
libpcre3-dev \
57-
libgeoip-dev \
5852
libxml2-dev \
5953
libfuzzy-dev \
6054
pcre2-utils \
@@ -97,17 +91,13 @@ jobs:
9791
- { label: "without ssdeep", opt: "--without-ssdeep" }
9892
- { label: "with lmdb", opt: "--with-lmdb" }
9993
- { label: "with pcre2 (default)", opt: "" }
100-
- { label: "with pcre", opt: "--with-pcre" }
10194

10295
steps:
10396
- uses: actions/checkout@v6
10497
with:
10598
fetch-depth: 0
106-
submodules: true
107-
108-
- name: Ensure submodules are fully initialized (recursive)
109-
run: git submodule update --init --recursive
110-
99+
submodules: recursive
100+
111101
- name: Install dependencies
112102
# curl and pcre2 are typically already available in the macOS runner image
113103
run: |
@@ -124,17 +114,6 @@ jobs:
124114
bison \
125115
flex
126116
127-
- name: Build GeoIP library
128-
run: |
129-
git clone --depth 1 --no-checkout https://github.com/maxmind/geoip-api-c.git
130-
cd geoip-api-c
131-
git fetch --tags
132-
# last release v1.6.12
133-
git checkout 4b526e7331ca1d692b74a0509ddcc725622ed31a
134-
autoreconf --install
135-
./configure --disable-dependency-tracking --disable-silent-rules --prefix=/opt/homebrew
136-
make install
137-
138117
- name: Run build preparation script
139118
run: ./build.sh
140119

@@ -171,10 +150,7 @@ jobs:
171150
- uses: actions/checkout@v6
172151
with:
173152
fetch-depth: 0
174-
submodules: true
175-
176-
- name: Ensure submodules are fully initialized (recursive)
177-
run: git submodule update --init --recursive
153+
submodules: recursive
178154

179155
- name: Install Conan package manager
180156
run: |
@@ -223,10 +199,7 @@ jobs:
223199
- uses: actions/checkout@v6
224200
with:
225201
fetch-depth: 0
226-
submodules: true
227-
228-
- name: Ensure submodules are fully initialized (recursive)
229-
run: git submodule update --init --recursive
202+
submodules: recursive
230203

231204
- name: Install cppcheck
232205
run: |
@@ -243,24 +216,22 @@ jobs:
243216
cppcheck-linux:
244217
name: Static analysis (cppcheck, Linux, debian:sid)
245218
runs-on: ubuntu-latest
246-
container: debian:sid
219+
container: debian:trixie
247220

248221
steps:
249222
- name: Install basic tools
250223
run: |
251224
apt-get update
252225
apt-get install -y git
253226
227+
- name: Mark repo as safe for git
228+
run: git config --global --add safe.directory $GITHUB_WORKSPACE
229+
254230
- uses: actions/checkout@v6
255231
with:
256232
fetch-depth: 0
257-
submodules: true
258-
259-
- name: Mark repo as safe for git
260-
run: git config --global --add safe.directory $GITHUB_WORKSPACE
233+
submodules: recursive
261234

262-
- name: Ensure submodules are fully initialized (recursive)
263-
run: git submodule update --init --recursive
264235

265236
- name: Install dependencies (v2 style)
266237
run: |
@@ -278,7 +249,6 @@ jobs:
278249
liblua5.2-dev \
279250
libmaxminddb-dev \
280251
libpcre2-dev \
281-
libgeoip-dev \
282252
libxml2-dev \
283253
libfuzzy-dev \
284254
pcre2-utils \
@@ -292,4 +262,4 @@ jobs:
292262
run: ./configure
293263

294264
- name: Run cppcheck
295-
run: make check-static
265+
run: make check-static

0 commit comments

Comments
 (0)