diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-12 14:27:45 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-12 14:27:45 +0200 |
| commit | e58e1323a8c3cd4d04731414dc050531b901fa23 (patch) | |
| tree | 2a7d1d98faf9e974ee6aae15d4e1040dabfc23e8 /src/minisketch/ci | |
| parent | 0de63b8b46eff5cda85b4950062703324ba65a80 (diff) | |
| parent | 1eea10a6d25fd8225560347cda2b1cfdc267910d (diff) | |
Update minisketch subtree to latest master
Diffstat (limited to 'src/minisketch/ci')
| -rwxr-xr-x | src/minisketch/ci/cirrus.sh | 8 | ||||
| -rw-r--r-- | src/minisketch/ci/linux-debian.Dockerfile | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/minisketch/ci/cirrus.sh b/src/minisketch/ci/cirrus.sh index 02f737ca7f..36250d1651 100755 --- a/src/minisketch/ci/cirrus.sh +++ b/src/minisketch/ci/cirrus.sh @@ -7,7 +7,7 @@ export LC_ALL=C env >> test_env.log -$CC -v || true +$CXX -v || true valgrind --version || true ./autogen.sh @@ -32,10 +32,10 @@ then fi if [ -n "$EXEC_CMD" ]; then - $EXEC_CMD ./test $TESTRUNS - $EXEC_CMD ./test-verify $TESTRUNS + $EXEC_CMD "./test$EXEC_EXT" $TESTRUNS + $EXEC_CMD "./test-verify$EXEC_EXT" $TESTRUNS fi if [ "$BENCH" = "yes" ]; then - $EXEC_CMD ./bench + $EXEC_CMD "./bench$EXEC_EXT" fi diff --git a/src/minisketch/ci/linux-debian.Dockerfile b/src/minisketch/ci/linux-debian.Dockerfile index 63e5412ee7..122af36e1f 100644 --- a/src/minisketch/ci/linux-debian.Dockerfile +++ b/src/minisketch/ci/linux-debian.Dockerfile @@ -8,10 +8,10 @@ RUN apt-get update RUN apt-get install --no-install-recommends --no-upgrade -y \ git ca-certificates \ make automake libtool pkg-config dpkg-dev valgrind qemu-user \ - gcc g++ clang libc6-dbg \ + gcc g++ clang libclang-rt-dev libc6-dbg \ gcc-i686-linux-gnu g++-i686-linux-gnu libc6-dev-i386-cross libc6-dbg:i386 \ - g++-s390x-linux-gnu gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \ - wine g++-mingw-w64-x86-64 + g++-s390x-linux-gnu libstdc++6:s390x gcc-s390x-linux-gnu libc6-dev-s390x-cross libc6-dbg:s390x \ + wine wine64 g++-mingw-w64-x86-64 # Run a dummy command in wine to make it set up configuration RUN wine true || true |