diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml index 26b115d3..04408685 100644 --- a/.github/workflows/bake.yml +++ b/.github/workflows/bake.yml @@ -135,8 +135,8 @@ jobs: run: | cid=$(docker create "$iid" /) rm -rf _artifact - mkdir -p "_artifact/$dst" - docker cp "$cid:$src" "_artifact/$dst/$dst" + mkdir -p "_artifact" + docker cp "$cid:$src" "_artifact/$dst" # Optionally extract the image itself as an artifact. - name: Extract Image @@ -151,8 +151,8 @@ jobs: run: | rm -rf _artifact - mkdir -p "_artifact/$dst" - docker save -o "_artifact/$dst/$dst" "$iid" + mkdir -p "_artifact" + docker save -o "_artifact/$dst" "$iid" # Upload either artifact - name: Upload Artifact @@ -162,5 +162,5 @@ jobs: uses: actions/upload-artifact@v4 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}} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 54f67a22..57579f1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ on: concurrency: group: ${{github.workflow}}-${{github.ref}} - cancel-in-progress: true + cancel-in-progress: false jobs: init: diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index cb1fc967..13252a96 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -57,7 +57,7 @@ jobs: includes: ${{inputs.includes}} artifact: > { - "standalone": {"dst": "tuwunel"}, + "standalone": {"dst": "tuwunel", "src": "/usr/bin/tuwunel" }, "tuwunel": {"dst": "tuwunel-docker.tar.gz", "img": true } } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0a221a85..da088b7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -82,6 +82,7 @@ jobs: excludes: > [ {"cargo_profile": "test", "feat_set": "default"}, + {"cargo_profile": "test", "rust_toolchain": "stable"}, {"cargo_profile": "release", "rust_toolchain": "nightly"}, {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"}, {"cargo_profile": "release-max-perf", "rust_toolchain": "stable"},