CI updates

This commit is contained in:
Markus F.X.J. Oberhumer 2023-11-05 09:03:38 +01:00
parent 11970d276d
commit b6dd61cea8
5 changed files with 9 additions and 12 deletions

View File

@ -13,8 +13,8 @@ env:
CTEST_OUTPUT_ON_FAILURE: "ON" CTEST_OUTPUT_ON_FAILURE: "ON"
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
UPX_CMAKE_BUILD_FLAGS: --verbose UPX_CMAKE_BUILD_FLAGS: --verbose
# 2023-11-03 # 2023-11-04
ZIG_DIST_VERSION: 0.12.0-dev.1390+94cee4fb2 ZIG_DIST_VERSION: 0.12.0-dev.1396+f6de3ec96
jobs: jobs:
job-rebuild-and-verify-stubs: job-rebuild-and-verify-stubs:

View File

@ -164,17 +164,14 @@ jobs:
shell: bash shell: bash
run: | run: |
xflags="-static -Wall -Wextra -Werror" xflags="-static -Wall -Wextra -Werror"
# clang uses the MSVC headers, adjust settings # clang uses the MSVC headers and libraries, so adjust settings
xflags="$xflags -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS" xflags="$xflags -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_SECURE_NO_WARNINGS"
export zlib_extra_flags="-DHAVE_VSNPRINTF" export zlib_extra_flags="-DHAVE_VSNPRINTF"
export AR=false # link without using $AR export AR_LIBFILE=upx_submodules.lib
CC="clang $xflags" CXX="clang++ -std=gnu++17 $xflags" bash "./upx with space/misc/scripts/build_upx_by_hand.sh" CC="clang $xflags" CXX="clang++ -std=gnu++17 $xflags" bash "./upx with space/misc/scripts/build_upx_by_hand.sh"
ls -l "upx with space"/build/by-hand || true
- name: 'Build by-hand with bash - gcc' - name: 'Build by-hand with bash - gcc'
if: success() || failure() # run this step even if the previous step failed if: success() || failure() # run this step even if the previous step failed
shell: bash shell: bash
run: | run: |
xflags="-static -Wall -Wextra -Werror" 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" 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

View File

@ -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.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.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:3.18', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
- { container: 'alpine:edge', use_cxx20: 1, use_cxx23: 1, use_lto: 1 } - { container: 'alpine:edge', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
- { container: 'i386/alpine:edge', use_cxx20: 1, use_cxx23: 1, use_lto: 1 } - { container: 'i386/alpine:edge', use_cxx20: 1, use_cxx2b: 1, use_lto: 1 }
# more 32-bit i386 versions, just for testing # 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.9' } # clang-5, gcc-8; BROKEN: clang -m32 problem
- { container: 'i386/alpine:3.10' } # clang-8, gcc-8 - { container: 'i386/alpine:3.10' } # clang-8, gcc-8

View File

@ -11,8 +11,8 @@ env:
CMAKE_REQUIRED_QUIET: "OFF" CMAKE_REQUIRED_QUIET: "OFF"
CTEST_OUTPUT_ON_FAILURE: "ON" CTEST_OUTPUT_ON_FAILURE: "ON"
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
# 2023-11-03 # 2023-11-04
ZIG_DIST_VERSION: 0.12.0-dev.1390+94cee4fb2 ZIG_DIST_VERSION: 0.12.0-dev.1396+f6de3ec96
jobs: jobs:
job-linux-zigcc: # uses cmake + make job-linux-zigcc: # uses cmake + make

View File

@ -128,7 +128,7 @@ if test "x$AR" = "x"; then
# link without using $AR # link without using $AR
run "CXX upx" $CXX -o upx *.o */*.o run "CXX upx" $CXX -o upx *.o */*.o
else else
run "AR libupx" $AR rcs libupx_submodules.a */*.o run "AR libupx" $AR rcs ${AR_LIBFILE:-libupx_submodules.a} */*.o
run "CXX upx" $CXX -o upx *.o -L. -lupx_submodules run "CXX upx" $CXX -o upx *.o -L. -lupx_submodules
fi fi
echo "# current directory: '$(pwd)'" echo "# current directory: '$(pwd)'"