CI updates

This commit is contained in:
Markus F.X.J. Oberhumer
2023-11-04 06:30:07 +01:00
parent d618716ec1
commit 11970d276d
11 changed files with 47 additions and 26 deletions
+5 -5
View File
@@ -13,8 +13,8 @@ env:
CTEST_OUTPUT_ON_FAILURE: "ON"
DEBIAN_FRONTEND: noninteractive
UPX_CMAKE_BUILD_FLAGS: --verbose
# 2023-11-01
ZIG_DIST_VERSION: 0.12.0-dev.1369+a09ba455c
# 2023-11-03
ZIG_DIST_VERSION: 0.12.0-dev.1390+94cee4fb2
jobs:
job-rebuild-and-verify-stubs:
@@ -146,8 +146,8 @@ jobs:
fail-fast: false
matrix:
include:
# NOTE: macos does not have "env -C"; only with coreutils
# NOTE: macos-11 does not have "readlink -f"; only on macos >= 12 or with coreutils
# NOTE: macos does not have "env -C"; only with brew coreutils
# NOTE: macos-11 does not have "readlink -f"; only on macos >= 12 or with brew coreutils
- { os: macos-11, gcc: gcc-10, gxx: 'g++-10', testsuite: true }
- { os: macos-12, gcc: gcc-11, gxx: 'g++-11', testsuite: true }
- { os: macos-13, gcc: gcc-12, gxx: 'g++-12', testsuite: true }
@@ -278,7 +278,7 @@ jobs:
env -C build/release/Release upx_exe=./upx bash "$testsuite_1"
job-windows-toolchains: # build "by hand" using cmd.exe
if: true
if: github.repository_owner == 'upx'
needs: [ job-rebuild-and-verify-stubs ]
name: ${{ format('windows {0}', matrix.name) }}
runs-on: ${{ matrix.os }}
+3 -1
View File
@@ -104,6 +104,7 @@ jobs:
job-by-hand-macos-clang: # uses a POSIX-compliant shell
# ...and also uses a subdirectory "upx with space" in order to detect possible quoting issues
# ...and also uses ccache as we are running the same build-script again and again
if: github.repository_owner == 'upx'
strategy:
fail-fast: false
@@ -168,7 +169,7 @@ jobs:
export zlib_extra_flags="-DHAVE_VSNPRINTF"
export AR=false # link without using $AR
CC="clang $xflags" CXX="clang++ -std=gnu++17 $xflags" bash "./upx with space/misc/scripts/build_upx_by_hand.sh"
ls -l build/by-hand || true
ls -l "upx with space"/build/by-hand || true
- name: 'Build by-hand with bash - gcc'
if: success() || failure() # run this step even if the previous step failed
shell: bash
@@ -176,3 +177,4 @@ jobs:
xflags="-static -Wall -Wextra -Werror"
# gcc uses the MingGW headers, so no extra settings are needed
CC="gcc $xflags" CXX="g++ -std=gnu++17 $xflags" bash "./upx with space/misc/scripts/build_upx_by_hand.sh"
ls -l "upx with space"/build/by-hand || true
+1
View File
@@ -13,6 +13,7 @@ env:
jobs:
BS0:
if: github.repository_owner == 'upx'
runs-on: ubuntu-latest
container: 'alpine:edge'
steps:
@@ -38,8 +38,8 @@ jobs:
- { container: 'alpine:3.16', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 } # May 2022: C++2b; clang-13 & gcc-11
- { container: 'alpine:3.17', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
- { container: 'alpine:3.18', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
- { container: 'alpine:edge', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
- { container: 'i386/alpine:edge', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
- { container: 'alpine:edge', use_cxx20: 1, use_cxx23: 1, use_lto: 1 }
- { container: 'i386/alpine:edge', use_cxx20: 1, use_cxx23: 1, use_lto: 1 }
# more 32-bit i386 versions, just for testing
# { container: 'i386/alpine:3.9' } # clang-5, gcc-8; BROKEN: clang -m32 problem
- { container: 'i386/alpine:3.10' } # clang-8, gcc-8
@@ -185,6 +185,7 @@ jobs:
for dir in "upx with space"/build/xtarget/*-cxx*/*; do
echo "===== $dir"
make -C "$dir" test
(cd "$dir" && ./upx --sysinfo -v)
done
- name: 'Run file system test suite (busybox)'
@@ -55,16 +55,19 @@ jobs:
CC="$CC -D_WIN32_WINNT=0x0400"; CXX="$CXX -D_WIN32_WINNT=0x0400"
make UPX_XTARGET=aarch64-w64-mingw32-clang xtarget/debug xtarget/release
- name: 'Build clang armv7'
if: success() || failure() # run this step even if the previous step failed
run: |
export CC="armv7-w64-mingw32-clang -static" CXX="armv7-w64-mingw32-clang++ -static"
CC="$CC -D_WIN32_WINNT=0x0400"; CXX="$CXX -D_WIN32_WINNT=0x0400"
make UPX_XTARGET=armv7-w64-mingw32-clang xtarget/debug xtarget/release
- name: 'Build clang i686'
if: success() || failure() # run this step even if the previous step failed
run: |
export CC="i686-w64-mingw32-clang -static" CXX="i686-w64-mingw32-clang++ -static"
CC="$CC -D_WIN32_WINNT=0x0400"; CXX="$CXX -D_WIN32_WINNT=0x0400"
make UPX_XTARGET=i686-w64-mingw32-clang xtarget/debug xtarget/release
- name: 'Build clang x86_64'
if: success() || failure() # run this step even if the previous step failed
run: |
export CC="x86_64-w64-mingw32-clang -static" CXX="x86_64-w64-mingw32-clang++ -static"
CC="$CC -D_WIN32_WINNT=0x0400"; CXX="$CXX -D_WIN32_WINNT=0x0400"
+2 -2
View File
@@ -11,8 +11,8 @@ env:
CMAKE_REQUIRED_QUIET: "OFF"
CTEST_OUTPUT_ON_FAILURE: "ON"
DEBIAN_FRONTEND: noninteractive
# 2023-11-01
ZIG_DIST_VERSION: 0.12.0-dev.1369+a09ba455c
# 2023-11-03
ZIG_DIST_VERSION: 0.12.0-dev.1390+94cee4fb2
jobs:
job-linux-zigcc: # uses cmake + make