Merge branch 'devel' into devel4

This commit is contained in:
Markus F.X.J. Oberhumer
2023-04-18 17:15:57 +02:00
33 changed files with 492 additions and 361 deletions
+3 -2
View File
@@ -4,5 +4,6 @@ updates:
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
# Check for updates to GitHub Actions every weekday
interval: 'daily'
# Check for updates to GitHub Actions every Wednesday
interval: 'weekly'
day: 'wednesday'
+3 -4
View File
@@ -205,7 +205,6 @@ jobs:
# windows-2019 used to work but got broken with the 20220821.1 runner-image
# update; we cannot download that image for inspection, and debugging the
# remote image is painful, so disable for now
# see https://github.com/actions/runner-images.git
####- { name: windows-2019-amd64, os: windows-2019 }
- { name: windows-2022-amd64, os: windows-2022 }
steps:
@@ -215,7 +214,7 @@ jobs:
- name: 'Check out test suite'
run: 'git clone --depth=1 https://github.com/upx/upx-testsuite ../deps/upx-testsuite'
- name: 'Inspect runner-image settings'
# debug remote image; also see https://github.com/actions/runner-images.git
# debug remote image; see https://github.com/actions/runner-images.git
if: ${{ false }}
run: |
Get-Command bash; Get-Command cmake; Get-Command make
@@ -377,8 +376,8 @@ jobs:
- { zig_target: x86_64-macos.13-none }
- { zig_target: x86_64-windows-gnu }
env:
# 2023-03-18
ZIG_DIST_VERSION: 0.11.0-dev.2157+f56f3c582
# 2023-04-17
ZIG_DIST_VERSION: 0.11.0-dev.2624+bc804eb84
# for zig-cc wrapper scripts (see below):
ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING
ZIG_FLAGS: ${{ matrix.zig_flags }}
+2 -2
View File
@@ -23,11 +23,11 @@ jobs:
issues: write
pull-requests: write
steps:
- uses: actions/stale@v7
- uses: actions/stale@v8
with:
operations-per-run: 300
exempt-all-milestones: true
exempt-issue-labels: 'blocker,enhancement,help wanted,regression'
exempt-issue-labels: 'blocker,bug,enhancement,help wanted,regression'
days-before-stale: 60
days-before-close: 30
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Please remove the stale label or add a comment or this issue will be closed in 30 days.'
+2 -2
View File
@@ -7,7 +7,7 @@ jobs:
job-alpine-cmake:
strategy:
fail-fast: false
matrix: {container: ['alpine:3.12','alpine:3.17','alpine:edge','i386/alpine:edge']}
matrix: { container: ['alpine:3.12','alpine:3.17','alpine:edge','i386/alpine:edge'] }
name: ${{ format('container {0}', matrix.container) }}
runs-on: ubuntu-latest
container: ${{ matrix.container }}
@@ -23,7 +23,7 @@ jobs:
- { name: 'Build gcc', run: 'make -C upx UPX_XTARGET=gcc-static CC="gcc -static" CXX="g++ -static"' }
- { name: 'Strip release binaries', run: 'strip -p --strip-unneeded upx/build/*/*/release/upx' }
- name: ${{ format('Upload artifact {0}', env.artifact_name) }}
if: ${{ !startsWith(matrix.container, 'i386/alpine') }} # missing nodejs
if: ${{ !startsWith(matrix.container, 'i386/') }} # i386: missing nodejs on host
uses: actions/upload-artifact@v3
with:
name: ${{ env.artifact_name }}