Skip to content

Commit a5be0df

Browse files
committed
[CI] Update, add libgit2, wolfssl, lawn, jerryscript
1 parent 592fc74 commit a5be0df

File tree

3 files changed

+59
-6
lines changed

3 files changed

+59
-6
lines changed

.github/workflows/linux_thirdparty.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
- { vm: interop, proj: test_imagemagick }
4747
- { vm: interop, proj: test_liballegro5 }
4848
- { vm: interop, proj: test_libexpat }
49+
- { vm: interop, proj: test_lwan }
4950
- { vm: interop, proj: test_micropython }
5051
- { vm: interop, proj: test_msgpack }
5152
- { vm: interop, proj: test_muon }
@@ -94,11 +95,13 @@ jobs:
9495
- { vm: main, proj: test_gzip }
9596
- { vm: main, proj: test_janet }
9697
- { vm: main, proj: test_jemalloc }
98+
- { vm: main, proj: test_jerryscript }
9799
- { vm: main, proj: test_jq }
98100
- { vm: main, proj: test_lame }
99101
- { vm: main, proj: test_libarchive }
100102
- { vm: main, proj: test_libevent }
101103
- { vm: main, proj: test_libgc }
104+
- { vm: main, proj: test_libgit2 }
102105
- { vm: main, proj: test_libgmp }
103106
- { vm: main, proj: test_libjansson }
104107
- { vm: main, proj: test_libjpeg }
@@ -147,6 +150,7 @@ jobs:
147150
- { vm: main, proj: test_toybox }
148151
- { vm: main, proj: test_vim }
149152
- { vm: main, proj: test_wget }
153+
- { vm: main, proj: test_wolfssl }
150154
- { vm: main, proj: test_xxhash }
151155
- { vm: main, proj: test_xz }
152156
- { vm: main, proj: test_yash }

scripts/debian_asan_interop.Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ RUN apt-get install -y --no-install-recommends \
1818
# liballegro5
1919
xvfb xauth \
2020
# msgpack
21-
libgtest-dev
21+
libgtest-dev \
22+
# lwan
23+
python3-requests libsqlite3-dev liblua5.1-0-dev libmariadb-dev
2224

2325
COPY . /work/slimcc
2426
WORKDIR /work/slimcc

scripts/linux_thirdparty.bash

Lines changed: 52 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
set -eu
22
set -o pipefail
33

4+
test_jerryscript() {
5+
github_tar jerryscript-project jerryscript v3.0.0
6+
sed -i 's|if(NOT (${CMAKE_C_COMPILER_ID} STREQUAL MSVC))|if(FALSE)|g' tests/unit-doc/CMakeLists.txt
7+
replace_line "#ifdef __GNUC__" "#if 1" jerry-ext/include/jerryscript-ext/autorelease.impl.h
8+
replace_line "#elif defined(__GNUC__)" "#elif 1" jerry-ext/include/jerryscript-ext/module.h
9+
python3 tools/run-tests.py --unittest
10+
python3 tools/run-tests.py --jerry-tests
11+
python3 tools/run-tests.py --test262
12+
python3 tools/build.py
13+
}
14+
415
test_bash() {
516
url_tar https://ftpmirror.gnu.org/gnu/bash/bash-5.3.tar.gz bash
617
fix_and_configure
@@ -195,7 +206,7 @@ test_gawk() {
195206
}
196207

197208
test_git() {
198-
github_tar git git v2.50.1
209+
github_tar git git v2.51.0
199210
make CC="$CC" test -j2
200211
}
201212

@@ -320,6 +331,18 @@ test_libgc() {
320331
make check
321332
}
322333

334+
test_libgit2(){
335+
github_tar libgit2 libgit2 v1.9.1
336+
use_stdatomic '#ifdef GIT_THREADS' src/util/thread.h
337+
sed -i 's|defined(GIT_BUILTIN_ATOMIC)|1|g' src/util/thread.h
338+
sed -i 's|__atomic_exchange(ptr, &newval, &foundval,|return atomic_exchange_explicit(ptr, newval,|g' src/util/thread.h
339+
sed -i 's|__atomic_compare_exchange(ptr, &foundval, &newval, false,|atomic_compare_exchange_strong_explicit(ptr, \&foundval, newval,|g' src/util/thread.h
340+
replace_line "#elif defined(__clang__) || defined(__GNUC__)" "#elif 1" deps/ntlmclient/utf8.h
341+
sed -i 's|__has_builtin(__builtin_add_overflow)|0|g' src/util/integer.h
342+
cmake . -DCMAKE_C_COMPILER=$CC
343+
make && ctest --verbose
344+
}
345+
323346
test_libgmp() {
324347
url_xz https://ftpmirror.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz gmp
325348
fix_and_configure
@@ -455,6 +478,23 @@ test_lua() {
455478
../lua -e"_port=true" all.lua # assertion at files.lua:84 fail in CI
456479
}
457480

481+
test_lwan(){
482+
github_tar lpereira lwan v0.7
483+
use_stdbit '#include <assert.h>' src/bin/tools/mimegen.c
484+
use_stdbit '#include <assert.h>' src/lib/timeout.c
485+
use_stdbit '#include <assert.h>' src/samples/techempower/json.c
486+
use_stdbit '#include <stdlib.h>' src/lib/lwan-private.h
487+
sed -i 's|defined(LWAN_HAVE_BUILTIN_CLZLL)|(1)|g' src/lib/lwan-private.h
488+
sed -i 's|__sync_##O##_and_fetch|__builtin_atomic_arith_##O|g' src/lib/lwan.h
489+
sed -i 's|__uint128_t|unsigned _BitInt(128)|g' src/lib/lwan-thread.c
490+
sed -i 's|__builtin_inf()|HUGE_VAL|g' src/samples/forthsalon/forth.c
491+
replace_line "#if defined(__x86_64__)" "#if 0" src/lib/lwan-websocket.c
492+
replace_line "#if __x86_64__" "#if 0" src/lib/lwan-template.c
493+
mkdir build && cd build
494+
cmake ../ -DCMAKE_C_COMPILER=$CC -DCMAKE_PREFIX_PATH=/usr/lib/x86_64-linux-gnu -DCMAKE_C_FLAGS=-fPIC
495+
make testsuite
496+
}
497+
458498
test_mawk() {
459499
github_tar ThomasDickey mawk-snapshots t20250131
460500
./configure
@@ -524,7 +564,7 @@ test_msgpack() {
524564
}
525565

526566
test_muon() {
527-
git_fetch https://github.com/muon-build/muon e6038ff33267ebf035d4aa839d7815fb34c427b0 muon
567+
git_fetch https://github.com/muon-build/muon 91e7009351bbfa032ddcc25764c92fced0f47faa muon
528568
sh ./bootstrap.sh build
529569
build/muon-bootstrap setup build
530570
sed -i 's/posix.default_linker = linker_posix/posix.default_linker = linker_ld/g' src/compilers.c
@@ -678,7 +718,7 @@ test_quickjs() {
678718
}
679719

680720
test_redis() {
681-
github_tar redis redis 8.2.0
721+
github_tar redis redis 8.2.1
682722
replace_line "# if defined(__GNUC__) && !(defined(__clang__) && defined(__cplusplus))" "#if 1" src/redismodule.h
683723
sed -i 's|asm volatile|__asm volatile|g' deps/hdr_histogram/hdr_atomic.h
684724
convert_atomic_x_fetch deps/hdr_histogram/hdr_atomic.h
@@ -805,6 +845,13 @@ test_wget() {
805845
make check
806846
}
807847

848+
test_wolfssl() {
849+
github_tar wolfSSL wolfssl v5.8.2-stable
850+
mkdir cmakebuild && cd cmakebuild
851+
cmake ../ -DCMAKE_C_COMPILER=$CC -DCMAKE_C_FLAGS=-fPIC
852+
make && ctest
853+
}
854+
808855
test_wuffs() {
809856
git_fetch https://github.com/google/wuffs 67e9078eabcbda867ccc9fa912d81cba4fb0aa89 wuffs
810857
sed -i 's|Building (C)|Build CC:$CC|g' ./build-example.sh
@@ -922,12 +969,12 @@ build_lynx() {
922969
}
923970

924971
build_nano() {
925-
url_tar https://www.nano-editor.org/dist/v8/nano-8.5.tar.gz nano
972+
url_xz https://www.nano-editor.org/dist/v8/nano-8.6.tar.xz nano
926973
./configure && make
927974
}
928975

929976
build_ncurses() {
930-
github_tar ThomasDickey ncurses-snapshots v6_5_20250809
977+
github_tar ThomasDickey ncurses-snapshots v6_5_20250816
931978
./configure
932979
make V=1
933980
}

0 commit comments

Comments
 (0)