diff --git a/.github/workflows/bake.yml b/.github/workflows/bake.yml index f58f65b2..a08da907 100644 --- a/.github/workflows/bake.yml +++ b/.github/workflows/bake.yml @@ -141,12 +141,14 @@ jobs: iid: ${{matrix.bake_target}}--${{matrix.cargo_profile}}--${{matrix.rust_toolchain}}--${{matrix.rust_target}}--${{matrix.feat_set}}--${{matrix.sys_name}}--${{matrix.sys_version}}--${{matrix.sys_target}} dst: ${{ fromJSON(inputs.artifact)[matrix.bake_target].dst }} src: ${{ fromJSON(inputs.artifact)[matrix.bake_target].src || fromJSON(inputs.artifact)[matrix.bake_target].dst }} + mod: ${{ fromJSON(inputs.artifact)[matrix.bake_target].chmod || 'u+r' }} run: | cid=$(docker create "$iid" /) rm -rf _artifact mkdir -p "_artifact" docker cp "$cid:$src" "_artifact/$dst" + chmod "$mod" "_artifact/$dst" # Optionally extract the image itself as an artifact. - name: Extract Image Artifact @@ -174,11 +176,13 @@ jobs: env: dst: ${{ fromJSON(inputs.artifact)[matrix.bake_target].dst }} src: ${{ fromJSON(inputs.artifact)[matrix.bake_target].src || fromJSON(inputs.artifact)[matrix.bake_target].dst }} + mod: ${{ fromJSON(inputs.artifact)[matrix.bake_target].chmod || 'u+r' }} run: | rm -rf _artifact mkdir -p "_artifact" mv "$src" "_artifact/$dst" + chmod "$mod" "_artifact/$dst" # Optionally compress extracted artifact - name: Compress Artifact @@ -194,9 +198,9 @@ jobs: run: | if test -n "$gzlev"; then - mv "_artifact/$dst" "_artifact/foo" - gzip "-$gzlev" "_artifact/foo" - mv "_artifact/foo.gz" "_artifact/$dst" + mv "_artifact/$dst" "_artifact/$dst.artifact" + gzip "-$gzlev" "_artifact/$dst.artifact" + mv "_artifact/$dst.artifact.gz" "_artifact/$dst" elif test -n "$zstlev"; then zstd "-$zstlev" "_artifact/$dst" mv "_artifact/$dst.zst" "_artifact/$dst" @@ -211,7 +215,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: _artifact/* - name: ${{matrix.cargo_profile}}-${{matrix.feat_set}}-${{fromJSON(inputs.artifact)[matrix.bake_target].dst}} + name: ${{matrix.cargo_profile}}-${{matrix.feat_set}}-${{matrix.sys_target}}-${{fromJSON(inputs.artifact)[matrix.bake_target].dst}} # Optionally upload artifact as pages-artifact - name: Upload Pages Artifact @@ -240,5 +244,5 @@ jobs: with: upload_url: ${{inputs.release_url}} asset_path: _artifact/${{fromJSON(inputs.artifact)[matrix.bake_target].dst}} - asset_name: ${{github.ref_name}}-${{matrix.cargo_profile}}-${{matrix.feat_set}}-${{fromJSON(inputs.artifact)[matrix.bake_target].dst}} + asset_name: ${{github.ref_name}}-${{matrix.cargo_profile}}-${{matrix.feat_set}}-${{matrix.sys_target}}-${{fromJSON(inputs.artifact)[matrix.bake_target].dst}} asset_content_type: ${{fromJSON(inputs.artifact)[matrix.bake_target].mime || 'application/octet-stream'}} diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index f76aacdc..36c847ac 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -96,7 +96,8 @@ jobs: "dst": "tuwunel.zst", "src": "/usr/bin/tuwunel", "mime": "application/zstd", - "zstd": 11 + "zstd": 11, + "chmod": "a+x" } } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab1f0704..4471dc8b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -177,7 +177,7 @@ jobs: id: upload uses: actions/upload-artifact@v4 with: - name: test_results.${{matrix.feat_set}}.${{matrix.sys_name}}.${{matrix.sys_target}}.jsonl + name: test_results-${{matrix.feat_set}}-${{matrix.sys_name}}-${{matrix.sys_target}}.jsonl path: ./tests/test_results/complement/test_results.jsonl - name: Accept diff --git a/docker/bake.hcl b/docker/bake.hcl index d555afaf..20cbab87 100644 --- a/docker/bake.hcl +++ b/docker/bake.hcl @@ -579,7 +579,7 @@ target "static" { tags = [ elem_tag("static", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"), ] - output = ["type=docker,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"] + output = ["type=docker,compression=uncompressed,mode=min"] matrix = cargo_rust_feat_sys inherits = [ elem("install", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target]),