CI: update

This commit is contained in:
Markus F.X.J. Oberhumer 2023-06-24 10:16:43 +02:00
parent b4a793ed26
commit 512a26cee4
5 changed files with 35 additions and 18 deletions

View File

@ -11,8 +11,8 @@ on: [push, workflow_dispatch]
env: env:
DEBIAN_FRONTEND: noninteractive DEBIAN_FRONTEND: noninteractive
UPX_CMAKE_BUILD_FLAGS: --verbose UPX_CMAKE_BUILD_FLAGS: --verbose
# 2023-06-11 # 2023-06-23
ZIG_DIST_VERSION: 0.11.0-dev.3395+1e7dcaa3a ZIG_DIST_VERSION: 0.11.0-dev.3777+64f0059cd
jobs: jobs:
job-rebuild-and-verify-stubs: job-rebuild-and-verify-stubs:
@ -377,9 +377,10 @@ jobs:
# only build a few targets => more targets are tested in the Weekly CI # only build a few targets => more targets are tested in the Weekly CI
- { zig_target: aarch64-linux-musl } - { zig_target: aarch64-linux-musl }
# { zig_target: aarch64-linux-musl, zig_pic: -fPIE } # { zig_target: aarch64-linux-musl, zig_pic: -fPIE }
- { zig_target: aarch64-macos.11-none } # { zig_target: aarch64-macos-none }
# { zig_target: aarch64-macos.12-none } - { zig_target: aarch64-macos.11.0-none }
# { zig_target: aarch64-macos.13-none } # { zig_target: aarch64-macos.12.0-none }
# { zig_target: aarch64-macos.13.0-none }
- { zig_target: aarch64-windows-gnu } - { zig_target: aarch64-windows-gnu }
# { zig_target: i386-linux-musl } # { zig_target: i386-linux-musl }
- { zig_target: i386-windows-gnu } - { zig_target: i386-windows-gnu }
@ -390,9 +391,10 @@ jobs:
# { zig_target: powerpc64le-linux-musl } # { zig_target: powerpc64le-linux-musl }
- { zig_target: x86_64-linux-musl } - { zig_target: x86_64-linux-musl }
# { zig_target: x86_64-linux-musl, zig_pic: -fPIE } # { zig_target: x86_64-linux-musl, zig_pic: -fPIE }
- { zig_target: x86_64-macos.11-none } # { zig_target: x86_64-macos-none }
# { zig_target: x86_64-macos.12-none } - { zig_target: x86_64-macos.11.0-none }
# { zig_target: x86_64-macos.13-none } # { zig_target: x86_64-macos.12.0-none }
# { zig_target: x86_64-macos.13.0-none }
- { zig_target: x86_64-windows-gnu } - { zig_target: x86_64-windows-gnu }
env: env:
# for zig-cc wrapper scripts (see below): # for zig-cc wrapper scripts (see below):
@ -469,7 +471,7 @@ jobs:
name: ${{ env.artifact_name }} name: ${{ env.artifact_name }}
path: tmp/artifact path: tmp/artifact
- name: 'Run install tests' - name: 'Run install tests'
if: ${{ contains(matrix.zig_target, '-linux-') }} if: ${{ contains(matrix.zig_target, '-linux') }}
run: | 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-cmake cmake --install .)
(cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make make install) (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make make install)

View File

@ -29,3 +29,9 @@ jobs:
run: | run: |
ctest --test-dir build/xcode -C Debug ctest --test-dir build/xcode -C Debug
ctest --test-dir build/xcode -C Release 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

View File

@ -7,8 +7,8 @@ on:
workflow_dispatch: workflow_dispatch:
env: env:
# 2023-06-11 # 2023-06-23
ZIG_DIST_VERSION: 0.11.0-dev.3395+1e7dcaa3a ZIG_DIST_VERSION: 0.11.0-dev.3777+64f0059cd
jobs: jobs:
job-linux-zigcc: job-linux-zigcc:
@ -21,9 +21,10 @@ jobs:
include: include:
- { zig_target: aarch64-linux-musl } - { zig_target: aarch64-linux-musl }
- { zig_target: aarch64-linux-musl, zig_pic: -fPIE } - { zig_target: aarch64-linux-musl, zig_pic: -fPIE }
- { zig_target: aarch64-macos.11-none } - { zig_target: aarch64-macos-none }
- { zig_target: aarch64-macos.12-none } - { zig_target: aarch64-macos.11.0-none }
- { zig_target: aarch64-macos.13-none } - { zig_target: aarch64-macos.12.0-none }
- { zig_target: aarch64-macos.13.0-none }
- { zig_target: aarch64-windows-gnu } - { zig_target: aarch64-windows-gnu }
- { zig_target: i386-linux-musl } - { zig_target: i386-linux-musl }
- { zig_target: i386-windows-gnu } - { zig_target: i386-windows-gnu }
@ -34,9 +35,10 @@ jobs:
- { zig_target: powerpc64le-linux-musl } - { zig_target: powerpc64le-linux-musl }
- { zig_target: x86_64-linux-musl } - { zig_target: x86_64-linux-musl }
- { zig_target: x86_64-linux-musl, zig_pic: -fPIE } - { zig_target: x86_64-linux-musl, zig_pic: -fPIE }
- { zig_target: x86_64-macos.11-none } - { zig_target: x86_64-macos-none }
- { zig_target: x86_64-macos.12-none } - { zig_target: x86_64-macos.11.0-none }
- { zig_target: x86_64-macos.13-none } - { zig_target: x86_64-macos.12.0-none }
- { zig_target: x86_64-macos.13.0-none }
- { zig_target: x86_64-windows-gnu } - { zig_target: x86_64-windows-gnu }
env: env:
# for zig-cc wrapper scripts (see below): # for zig-cc wrapper scripts (see below):
@ -113,7 +115,7 @@ jobs:
name: ${{ env.artifact_name }} name: ${{ env.artifact_name }}
path: tmp/artifact path: tmp/artifact
- name: 'Run install tests' - name: 'Run install tests'
if: ${{ contains(matrix.zig_target, '-linux-') }} if: ${{ contains(matrix.zig_target, '-linux') }}
run: | 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-cmake cmake --install .)
(cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make make install) (cd build/zig/${ZIG_TARGET}${ZIG_PIC}/release && DESTDIR=$PWD/Install-with-make make install)

View File

@ -417,6 +417,7 @@ function(print_var)
endif() endif()
endforeach() endforeach()
endfunction() endfunction()
print_var(CMAKE_VERSION)
if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO) if(NOT UPX_CONFIG_CMAKE_DISABLE_PRINT_INFO)
print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION) print_var(CMAKE_HOST_SYSTEM_NAME CMAKE_HOST_SYSTEM_VERSION)
print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING) print_var(CMAKE_SYSTEM_NAME CMAKE_SYSTEM_VERSION CMAKE_CROSSCOMPILING)

View File

@ -243,6 +243,12 @@ struct CheckIntegral {
assert(t.a == 0); assert(t.a == 0);
assert(t.x[0] == 0 && t.x[1] == 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<T>(); checkU<T>();
checkU<typename std::add_const<T>::type>(); checkU<typename std::add_const<T>::type>();
} }