ci: Prevent cancellation on push to branch.

ci: Use wildcard to preserve any artifact directory structure. (970cea5c2b)

ci: Mask out debug smoketest on toolchain stable

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-06-02 06:05:40 +00:00
parent d06ad8d788
commit 1a6cfe72b9
4 changed files with 8 additions and 7 deletions

View File

@@ -135,8 +135,8 @@ jobs:
run: | run: |
cid=$(docker create "$iid" /) cid=$(docker create "$iid" /)
rm -rf _artifact rm -rf _artifact
mkdir -p "_artifact/$dst" mkdir -p "_artifact"
docker cp "$cid:$src" "_artifact/$dst/$dst" docker cp "$cid:$src" "_artifact/$dst"
# Optionally extract the image itself as an artifact. # Optionally extract the image itself as an artifact.
- name: Extract Image - name: Extract Image
@@ -151,8 +151,8 @@ jobs:
run: | run: |
rm -rf _artifact rm -rf _artifact
mkdir -p "_artifact/$dst" mkdir -p "_artifact"
docker save -o "_artifact/$dst/$dst" "$iid" docker save -o "_artifact/$dst" "$iid"
# Upload either artifact # Upload either artifact
- name: Upload Artifact - name: Upload Artifact
@@ -162,5 +162,5 @@ jobs:
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
path: _artifact/${{ fromJSON(inputs.artifact)[matrix.bake_target].dst }} path: _artifact/*
name: ${{matrix.cargo_profile}}-${{matrix.feat_set}}-${{fromJSON(inputs.artifact)[matrix.bake_target].dst}} name: ${{matrix.cargo_profile}}-${{matrix.feat_set}}-${{fromJSON(inputs.artifact)[matrix.bake_target].dst}}

View File

@@ -11,7 +11,7 @@ on:
concurrency: concurrency:
group: ${{github.workflow}}-${{github.ref}} group: ${{github.workflow}}-${{github.ref}}
cancel-in-progress: true cancel-in-progress: false
jobs: jobs:
init: init:

View File

@@ -57,7 +57,7 @@ jobs:
includes: ${{inputs.includes}} includes: ${{inputs.includes}}
artifact: > artifact: >
{ {
"standalone": {"dst": "tuwunel"}, "standalone": {"dst": "tuwunel", "src": "/usr/bin/tuwunel" },
"tuwunel": {"dst": "tuwunel-docker.tar.gz", "img": true } "tuwunel": {"dst": "tuwunel-docker.tar.gz", "img": true }
} }

View File

@@ -82,6 +82,7 @@ jobs:
excludes: > excludes: >
[ [
{"cargo_profile": "test", "feat_set": "default"}, {"cargo_profile": "test", "feat_set": "default"},
{"cargo_profile": "test", "rust_toolchain": "stable"},
{"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "release", "rust_toolchain": "nightly"},
{"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}, {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"},
{"cargo_profile": "release-max-perf", "rust_toolchain": "stable"}, {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"},