From 512a26cee4adec0618963be932463759871e7297 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Sat, 24 Jun 2023 10:16:43 +0200 Subject: [PATCH] CI: update --- .github/workflows/ci.yml | 20 ++++++++++--------- .../workflows/weekly-ci-macos-cmake-xcode.yml | 6 ++++++ .github/workflows/weekly-ci-zigcc.yml | 20 ++++++++++--------- CMakeLists.txt | 1 + src/check/dt_check.cpp | 6 ++++++ 5 files changed, 35 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 38c5717c..940a0b4c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ on: [push, workflow_dispatch] env: DEBIAN_FRONTEND: noninteractive UPX_CMAKE_BUILD_FLAGS: --verbose - # 2023-06-11 - ZIG_DIST_VERSION: 0.11.0-dev.3395+1e7dcaa3a + # 2023-06-23 + ZIG_DIST_VERSION: 0.11.0-dev.3777+64f0059cd jobs: job-rebuild-and-verify-stubs: @@ -377,9 +377,10 @@ jobs: # only build a few targets => more targets are tested in the Weekly CI - { zig_target: aarch64-linux-musl } # { zig_target: aarch64-linux-musl, zig_pic: -fPIE } - - { zig_target: aarch64-macos.11-none } - # { zig_target: aarch64-macos.12-none } - # { zig_target: aarch64-macos.13-none } + # { zig_target: aarch64-macos-none } + - { zig_target: aarch64-macos.11.0-none } + # { zig_target: aarch64-macos.12.0-none } + # { zig_target: aarch64-macos.13.0-none } - { zig_target: aarch64-windows-gnu } # { zig_target: i386-linux-musl } - { zig_target: i386-windows-gnu } @@ -390,9 +391,10 @@ jobs: # { zig_target: powerpc64le-linux-musl } - { zig_target: x86_64-linux-musl } # { zig_target: x86_64-linux-musl, zig_pic: -fPIE } - - { zig_target: x86_64-macos.11-none } - # { zig_target: x86_64-macos.12-none } - # { zig_target: x86_64-macos.13-none } + # { zig_target: x86_64-macos-none } + - { zig_target: x86_64-macos.11.0-none } + # { zig_target: x86_64-macos.12.0-none } + # { zig_target: x86_64-macos.13.0-none } - { zig_target: x86_64-windows-gnu } env: # for zig-cc wrapper scripts (see below): @@ -469,7 +471,7 @@ jobs: name: ${{ env.artifact_name }} path: tmp/artifact - name: 'Run install tests' - if: ${{ contains(matrix.zig_target, '-linux-') }} + if: ${{ contains(matrix.zig_target, '-linux') }} run: | (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-cmake cmake --install .) (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make make install) diff --git a/.github/workflows/weekly-ci-macos-cmake-xcode.yml b/.github/workflows/weekly-ci-macos-cmake-xcode.yml index 480c175c..1e4e9608 100644 --- a/.github/workflows/weekly-ci-macos-cmake-xcode.yml +++ b/.github/workflows/weekly-ci-macos-cmake-xcode.yml @@ -29,3 +29,9 @@ jobs: run: | ctest --test-dir build/xcode -C Debug ctest --test-dir build/xcode -C Release + - name: 'Run install tests' + run: | + (cd build/xcode && DESTDIR=$PWD/Install-default cmake --install .) + (cd build/xcode && DESTDIR=$PWD/Install-debug cmake --install . --config Debug) + (cd build/xcode && DESTDIR=$PWD/Install-release cmake --install . --config Release) + ls -l build/xcode/Install-*/usr/local/bin/upx diff --git a/.github/workflows/weekly-ci-zigcc.yml b/.github/workflows/weekly-ci-zigcc.yml index cebf8797..0ca784b1 100644 --- a/.github/workflows/weekly-ci-zigcc.yml +++ b/.github/workflows/weekly-ci-zigcc.yml @@ -7,8 +7,8 @@ on: workflow_dispatch: env: - # 2023-06-11 - ZIG_DIST_VERSION: 0.11.0-dev.3395+1e7dcaa3a + # 2023-06-23 + ZIG_DIST_VERSION: 0.11.0-dev.3777+64f0059cd jobs: job-linux-zigcc: @@ -21,9 +21,10 @@ jobs: include: - { zig_target: aarch64-linux-musl } - { zig_target: aarch64-linux-musl, zig_pic: -fPIE } - - { zig_target: aarch64-macos.11-none } - - { zig_target: aarch64-macos.12-none } - - { zig_target: aarch64-macos.13-none } + - { zig_target: aarch64-macos-none } + - { zig_target: aarch64-macos.11.0-none } + - { zig_target: aarch64-macos.12.0-none } + - { zig_target: aarch64-macos.13.0-none } - { zig_target: aarch64-windows-gnu } - { zig_target: i386-linux-musl } - { zig_target: i386-windows-gnu } @@ -34,9 +35,10 @@ jobs: - { zig_target: powerpc64le-linux-musl } - { zig_target: x86_64-linux-musl } - { zig_target: x86_64-linux-musl, zig_pic: -fPIE } - - { zig_target: x86_64-macos.11-none } - - { zig_target: x86_64-macos.12-none } - - { zig_target: x86_64-macos.13-none } + - { zig_target: x86_64-macos-none } + - { zig_target: x86_64-macos.11.0-none } + - { zig_target: x86_64-macos.12.0-none } + - { zig_target: x86_64-macos.13.0-none } - { zig_target: x86_64-windows-gnu } env: # for zig-cc wrapper scripts (see below): @@ -113,7 +115,7 @@ jobs: name: ${{ env.artifact_name }} path: tmp/artifact - name: 'Run install tests' - if: ${{ contains(matrix.zig_target, '-linux-') }} + if: ${{ contains(matrix.zig_target, '-linux') }} run: | (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-cmake cmake --install .) (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make make install) diff --git a/CMakeLists.txt b/CMakeLists.txt index e367472f..39788c75 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -417,6 +417,7 @@ function(print_var) endif() endforeach() endfunction() +print_var(CMAKE_VERSION) if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO) print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION) print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING) diff --git a/src/check/dt_check.cpp b/src/check/dt_check.cpp index 3600d3b1..a183bd1d 100644 --- a/src/check/dt_check.cpp +++ b/src/check/dt_check.cpp @@ -243,6 +243,12 @@ struct CheckIntegral { assert(t.a == 0); assert(t.x[0] == 0 && t.x[1] == 0); } + { + TestT t; + mem_clear(&t); + assert(t.a == 0); + assert(t.x[0] == 0 && t.x[1] == 0); + } checkU(); checkU::type>(); }