From f1a9d1bec9beeea325e6a36a34d2d3e598adc9e5 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sun, 20 Jul 2025 00:38:43 +0200 Subject: [PATCH] CI updates --- .github/workflows/ci.yml | 5 +++++ misc/make/Makefile-extra.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c1b48e3f..bc80056a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,6 +118,11 @@ jobs: jobs="gcc/debug gcc/release clang/debug clang/release" echo "===== parallel jobs: $jobs" parallel -kv --lb 'cd build/extra/{} && bash ../../../../misc/testsuite/mimic_ctest_sigsegv.sh' ::: $jobs + - name: Run ctest tests + run: | + jobs="gcc/debug gcc/release clang/debug clang/release" + echo "===== parallel jobs: $jobs" + CTEST_JOBS=2 parallel -kv --lb 'make build/extra/{}+test' ::: $jobs job-linux-cmake: # uses cmake + make if: true diff --git a/misc/make/Makefile-extra.mk b/misc/make/Makefile-extra.mk index 474b245e..f3622392 100644 --- a/misc/make/Makefile-extra.mk +++ b/misc/make/Makefile-extra.mk @@ -177,7 +177,7 @@ build/extra/gcc-std-cxx23/%: export CXX = g++ -std=gnu++2b build/extra/gcc-std-cxx23/%: export UPX_CONFIG_DISABLE_C_STANDARD = ON build/extra/gcc-std-cxx23/%: export UPX_CONFIG_DISABLE_CXX_STANDARD = ON -# force building with gcc/g++ C++26 (EXPERIMENTAL; need gcc-14) +# force building with gcc/g++ C++26 (and C23) build/extra/gcc-std-cxx26/debug: PHONY; $(call run_config_and_build,$@,Debug) build/extra/gcc-std-cxx26/release: PHONY; $(call run_config_and_build,$@,Release) build/extra/gcc-std-cxx26/%: export CC = gcc -std=gnu23