From f39c02afa2dc24c38708ad5ca838337d3278d459 Mon Sep 17 00:00:00 2001 From: Jens Holdgaard Pedersen Date: Fri, 19 Jun 2026 21:16:17 +0200 Subject: [PATCH 1/5] ci: adopt cargo-dist for signed binary releases Replace the changelog-only release workflow with a cargo-dist (v0.32.0) pipeline. On a `v*` semver tag it cross-compiles the `ourios-server` binary for Linux, generates per-artifact + aggregate sha256 checksums, a CycloneDX SBOM, and GitHub build-provenance attestations, then publishes the GitHub Release. The signed release assets (attestations + SBOM) are what flips OpenSSF Scorecard's Signed-Releases check. - targets: x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu (gnu-only for v0). musl was tried in config but dropped: the cross-build could not be verified clean in this environment (macOS host, no Linux/musl toolchain), and shipping an unverified target into a tag-triggered pipeline is not worth it for v0. macOS/Windows are out of scope for a Linux server backend. - installers: shell only (npm/msi/homebrew skipped for v0). - cargo-cyclonedx = true (CycloneDX SBOM per release). - github-attestations = true (build provenance via actions/attest). - All crates are `version = 0.0.0` / `publish = false`; `dist = true` in ourios-server's `[package.metadata.dist]` opts the one binary back in as the sole distributable, leaving the library crates excluded. - cargo-dist now owns the GitHub Release + its release notes (read from CHANGELOG.md), replacing the git-cliff step. cliff.toml is left in place but is no longer wired into the release pipeline. Fixes the one upstream-template typo in the generated workflow (`steps.cargo-cyclonedx.output.paths` -> `outputs.paths`) so the SBOM files are actually collected into the upload glob; without it the SBOM silently drops out. The cargo-dist-generated actions are left pinned as dist generates them (by major tag, by design). Co-Authored-By: Claude Opus 4.8 --- .github/workflows/release.yml | 331 ++++++++++++++++++++++++++++++-- Cargo.toml | 5 + crates/ourios-server/Cargo.toml | 6 + dist-workspace.toml | 25 +++ 4 files changed, 348 insertions(+), 19 deletions(-) create mode 100644 dist-workspace.toml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 429917577..c92815c67 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,30 +1,323 @@ -name: release -on: - push: - tags: ["v*"] +# This file was autogenerated by dist: https://axodotdev.github.io/cargo-dist +# +# Copyright 2022-2024, axodotdev +# SPDX-License-Identifier: MIT or Apache-2.0 +# +# CI that: +# +# * checks for a Git Tag that looks like a release +# * builds artifacts with dist (archives, installers, hashes) +# * uploads those artifacts to temporary workflow zip +# * on success, uploads the artifacts to a GitHub Release +# +# Note that the GitHub Release will be created with a generated +# title/body based on your changelogs. +name: Release permissions: - contents: read + "contents": "write" + +# This task will run whenever you push a git tag that looks like a version +# like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc. +# Various formats will be parsed into a VERSION and an optional PACKAGE_NAME, where +# PACKAGE_NAME must be the name of a Cargo package in your workspace, and VERSION +# must be a Cargo-style SemVer Version (must have at least major.minor.patch). +# +# If PACKAGE_NAME is specified, then the announcement will be for that +# package (erroring out if it doesn't have the given version or isn't dist-able). +# +# If PACKAGE_NAME isn't specified, then the announcement will be for all +# (dist-able) packages in the workspace with that version (this mode is +# intended for workspaces with only one dist-able package, or with all dist-able +# packages versioned/released in lockstep). +# +# If you push multiple tags at once, separate instances of this workflow will +# spin up, creating an independent announcement for each one. However, GitHub +# will hard limit this to 3 tags per commit, as it will assume more tags is a +# mistake. +# +# If there's a prerelease-style suffix to the version, then the release(s) +# will be marked as a prerelease. +on: + pull_request: + push: + tags: + - '**[0-9]+.[0-9]+.[0-9]+*' jobs: - changelog: - runs-on: ubuntu-latest + # Run 'dist plan' (or host) to determine what tasks we need to do + plan: + runs-on: "ubuntu-22.04" + outputs: + val: ${{ steps.plan.outputs.manifest }} + tag: ${{ !github.event.pull_request && github.ref_name || '' }} + tag-flag: ${{ !github.event.pull_request && format('--tag={0}', github.ref_name) || '' }} + publishing: ${{ !github.event.pull_request }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v6 + with: + persist-credentials: false + submodules: recursive + - name: Install dist + # we specify bash to get pipefail; it guards against the `curl` command + # failing. otherwise `sh` won't catch that `curl` returned non-0 + shell: bash + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.32.0/cargo-dist-installer.sh | sh" + - name: Cache dist + uses: actions/upload-artifact@v7 + with: + name: cargo-dist-cache + path: ~/.cargo/bin/dist + # sure would be cool if github gave us proper conditionals... + # so here's a doubly-nested ternary-via-truthiness to try to provide the best possible + # functionality based on whether this is a pull_request, and whether it's from a fork. + # (PRs run on the *source* but secrets are usually on the *target* -- that's *good* + # but also really annoying to build CI around when it needs secrets to work right.) + - id: plan + run: | + dist ${{ (!github.event.pull_request && format('host --steps=create --tag={0}', github.ref_name)) || 'plan' }} --output-format=json > plan-dist-manifest.json + echo "dist ran successfully" + cat plan-dist-manifest.json + echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT" + - name: "Upload dist-manifest.json" + uses: actions/upload-artifact@v7 + with: + name: artifacts-plan-dist-manifest + path: plan-dist-manifest.json + + # Build and packages all the platform-specific things + build-local-artifacts: + name: build-local-artifacts (${{ join(matrix.targets, ', ') }}) + # Let the initial task tell us to not run (currently very blunt) + needs: + - plan + if: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix.include != null && (needs.plan.outputs.publishing == 'true' || fromJson(needs.plan.outputs.val).ci.github.pr_run_mode == 'upload') }} + strategy: + fail-fast: false + # Target platforms/runners are computed by dist in create-release. + # Each member of the matrix has the following arguments: + # + # - runner: the github runner + # - dist-args: cli flags to pass to dist + # - install-dist: expression to run to install dist on the runner + # + # Typically there will be: + # - 1 "global" task that builds universal installers + # - N "local" tasks that build each platform's binaries and platform-specific installers + matrix: ${{ fromJson(needs.plan.outputs.val).ci.github.artifacts_matrix }} + runs-on: ${{ matrix.runner }} + container: ${{ matrix.container && matrix.container.image || null }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BUILD_MANIFEST_NAME: target/distrib/${{ join(matrix.targets, '-') }}-dist-manifest.json permissions: - # `write` so `action-gh-release` can create the GitHub Release. - contents: write + "attestations": "write" + "contents": "read" + "id-token": "write" steps: - - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4 + - name: enable windows longpaths + run: | + git config --global core.longpaths true + - uses: actions/checkout@v6 with: - fetch-depth: 0 persist-credentials: false - - name: Generate changelog - uses: orhun/git-cliff-action@f50e11560dce63f7c33227798f90b924471a88b5 # v4 + submodules: recursive + - name: Install Rust non-interactively if not already installed + if: ${{ matrix.container }} + run: | + if ! command -v cargo > /dev/null 2>&1; then + curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y + echo "$HOME/.cargo/bin" >> $GITHUB_PATH + fi + - name: Install dist + run: ${{ matrix.install_dist.run }} + # Get the dist-manifest + - name: Fetch local artifacts + uses: actions/download-artifact@v8 with: - config: cliff.toml - args: --latest --strip header - env: - OUTPUT: CHANGES.md + pattern: artifacts-* + path: target/distrib/ + merge-multiple: true + - name: Install dependencies + run: | + ${{ matrix.packages_install }} + - name: Build artifacts + run: | + # Actually do builds and make zips and whatnot + dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json + echo "dist ran successfully" + - name: Attest + uses: actions/attest@v4 + with: + subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}*" + - id: cargo-dist + name: Post-build + # We force bash here just because github makes it really hard to get values up + # to "real" actions without writing to env-vars, and writing to env-vars has + # inconsistent syntax between shell and powershell. + shell: bash + run: | + # Parse out what we just built and upload it to scratch storage + echo "paths<> "$GITHUB_OUTPUT" + dist print-upload-files-from-manifest --manifest dist-manifest.json >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + + cp dist-manifest.json "$BUILD_MANIFEST_NAME" + - name: "Upload artifacts" + uses: actions/upload-artifact@v7 + with: + name: artifacts-build-local-${{ join(matrix.targets, '_') }} + path: | + ${{ steps.cargo-dist.outputs.paths }} + ${{ env.BUILD_MANIFEST_NAME }} + + # Build and package all the platform-agnostic(ish) things + build-global-artifacts: + needs: + - plan + - build-local-artifacts + runs-on: "ubuntu-22.04" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json + steps: + - uses: actions/checkout@v6 + with: + persist-credentials: false + submodules: recursive + - name: Install cached dist + uses: actions/download-artifact@v8 + with: + name: cargo-dist-cache + path: ~/.cargo/bin/ + - run: chmod +x ~/.cargo/bin/dist + - name: Install cargo-cyclonedx + # we specify bash to get pipefail; it guards against the `curl` command + # failing. otherwise `sh` won't catch that `curl` return non-0 + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/CycloneDX/cyclonedx-rust-cargo/releases/download/cargo-cyclonedx-0.5.5/cargo-cyclonedx-installer.sh | sh" + shell: bash + # Get all the local artifacts for the global tasks to use (for e.g. checksums) + - name: Fetch local artifacts + uses: actions/download-artifact@v8 + with: + pattern: artifacts-* + path: target/distrib/ + merge-multiple: true + - id: cargo-dist + shell: bash + run: | + dist build ${{ needs.plan.outputs.tag-flag }} --output-format=json "--artifacts=global" > dist-manifest.json + echo "dist ran successfully" + + # Parse out what we just built and upload it to scratch storage + echo "paths<> "$GITHUB_OUTPUT" + jq --raw-output ".upload_files[]" dist-manifest.json >> "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + + cp dist-manifest.json "$BUILD_MANIFEST_NAME" + - id: cargo-cyclonedx + shell: bash + run: | + # Generate SBOM (.cdx.xml) files. + cargo cyclonedx -v + + # Move all SBOM (.cdx.xml) files under target/distrib/ since + # we expect all artifacts to be in that folder. + find . -name '*.cdx.xml' -exec mv '{}' target/distrib/ ';' + + echo "paths<> "$GITHUB_OUTPUT" + find . -name '*.cdx.xml' | tee -a "$GITHUB_OUTPUT" + echo "EOF" >> "$GITHUB_OUTPUT" + - name: "Upload artifacts" + uses: actions/upload-artifact@v7 + with: + name: artifacts-build-global + path: | + ${{ steps.cargo-dist.outputs.paths }} + ${{ steps.cargo-cyclonedx.outputs.paths }} + ${{ env.BUILD_MANIFEST_NAME }} + # Determines if we should publish/announce + host: + needs: + - plan + - build-local-artifacts + - build-global-artifacts + # Only run if we're "publishing", and only if plan, local and global didn't fail (skipped is fine) + if: ${{ always() && needs.plan.result == 'success' && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.build-local-artifacts.result == 'skipped' || needs.build-local-artifacts.result == 'success') }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + runs-on: "ubuntu-22.04" + outputs: + val: ${{ steps.host.outputs.manifest }} + steps: + - uses: actions/checkout@v6 + with: + persist-credentials: false + submodules: recursive + - name: Install cached dist + uses: actions/download-artifact@v8 + with: + name: cargo-dist-cache + path: ~/.cargo/bin/ + - run: chmod +x ~/.cargo/bin/dist + # Fetch artifacts from scratch-storage + - name: Fetch artifacts + uses: actions/download-artifact@v8 + with: + pattern: artifacts-* + path: target/distrib/ + merge-multiple: true + - id: host + shell: bash + run: | + dist host ${{ needs.plan.outputs.tag-flag }} --steps=upload --steps=release --output-format=json > dist-manifest.json + echo "artifacts uploaded and released successfully" + cat dist-manifest.json + echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT" + - name: "Upload dist-manifest.json" + uses: actions/upload-artifact@v7 + with: + # Overwrite the previous copy + name: artifacts-dist-manifest + path: dist-manifest.json + # Create a GitHub Release while uploading all files to it + - name: "Download GitHub Artifacts" + uses: actions/download-artifact@v8 + with: + pattern: artifacts-* + path: artifacts + merge-multiple: true + - name: Cleanup + run: | + # Remove the granular manifests + rm -f artifacts/*-dist-manifest.json - name: Create GitHub Release - uses: softprops/action-gh-release@3bb12739c298aeb8a4eeaf626c5b8d85266b0e65 # v2 + env: + PRERELEASE_FLAG: "${{ fromJson(steps.host.outputs.manifest).announcement_is_prerelease && '--prerelease' || '' }}" + ANNOUNCEMENT_TITLE: "${{ fromJson(steps.host.outputs.manifest).announcement_title }}" + ANNOUNCEMENT_BODY: "${{ fromJson(steps.host.outputs.manifest).announcement_github_body }}" + RELEASE_COMMIT: "${{ github.sha }}" + run: | + # Write and read notes from a file to avoid quoting breaking things + echo "$ANNOUNCEMENT_BODY" > $RUNNER_TEMP/notes.txt + + gh release create "${{ needs.plan.outputs.tag }}" --target "$RELEASE_COMMIT" $PRERELEASE_FLAG --title "$ANNOUNCEMENT_TITLE" --notes-file "$RUNNER_TEMP/notes.txt" artifacts/* + + announce: + needs: + - plan + - host + # use "always() && ..." to allow us to wait for all publish jobs while + # still allowing individual publish jobs to skip themselves (for prereleases). + # "host" however must run to completion, no skipping allowed! + if: ${{ always() && needs.host.result == 'success' }} + runs-on: "ubuntu-22.04" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + steps: + - uses: actions/checkout@v6 with: - body_path: CHANGES.md + persist-credentials: false + submodules: recursive diff --git a/Cargo.toml b/Cargo.toml index e42d6fb41..ed98b93a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -39,3 +39,8 @@ bare_urls = "warn" [workspace.lints.clippy] pedantic = { level = "warn", priority = -1 } + +# The profile that 'dist' will build with +[profile.dist] +inherits = "release" +lto = "thin" diff --git a/crates/ourios-server/Cargo.toml b/crates/ourios-server/Cargo.toml index 597c94475..7c3ccbf28 100644 --- a/crates/ourios-server/Cargo.toml +++ b/crates/ourios-server/Cargo.toml @@ -8,6 +8,12 @@ license.workspace = true repository.workspace = true publish = false +# `publish = false` (all crates are pre-release 0.0.0) otherwise hides the +# binary from cargo-dist; `dist = true` opts this one package back in as the +# sole distributable artifact for `v*` tag releases. +[package.metadata.dist] +dist = true + [[bin]] name = "ourios-server" path = "src/main.rs" diff --git a/dist-workspace.toml b/dist-workspace.toml new file mode 100644 index 000000000..7e5b68a21 --- /dev/null +++ b/dist-workspace.toml @@ -0,0 +1,25 @@ +[workspace] +members = ["cargo:."] + +# Config for 'dist' +[dist] +# The preferred dist version to use in CI (Cargo.toml SemVer syntax) +cargo-dist-version = "0.32.0" +# CI backends to support +ci = "github" +# The installers to generate for each app +installers = ["shell"] +# Target platforms to build apps for (Rust target-triple syntax). Ourios +# ships a Linux server backend, so v0 builds Linux only (no macOS/Windows). +# gnu only for v0: musl is deferred because the cross-build could not be +# verified clean in this environment (see PR notes), and shipping an +# unverified target into a tag-triggered pipeline is not worth it for v0. +targets = [ + "x86_64-unknown-linux-gnu", + "aarch64-unknown-linux-gnu", +] +# Generate a CycloneDX SBOM alongside every release (cargo-cyclonedx). +cargo-cyclonedx = true +# Emit GitHub build provenance attestations for every release asset; these +# signed artifacts are what flips OpenSSF Scorecard's Signed-Releases check. +github-attestations = true From 0d5b5f056141b958b53d57dc8cb2b34af19380ed Mon Sep 17 00:00:00 2001 From: Jens Holdgaard Pedersen Date: Fri, 19 Jun 2026 23:47:08 +0200 Subject: [PATCH 2/5] ci(release): pin actions to SHAs and fix cargo-dist generated bugs Hand-pin the floating GitHub Action references in the cargo-dist 0.32.0 generated release pipeline to immutable commit SHAs, matching the repo's supply-chain hardening posture. Renovate will keep these pinned after any future `dist generate`: - actions/checkout@v6 -> df4cb1c069e1874edd31b4311f1884172cec0e10 - actions/upload-artifact@v7 -> 043fb46d1a93c77aae656e7c1c64a875d1fc6a0a - actions/download-artifact@v8 -> 3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c - actions/attest@v4 -> 59d89421af93a897026c735860bf21b6eb4f7b26 cargo-dist's own actions (axodotdev/*, the installer) are left as dist pins them. Also fix three real bugs in the generated workflow. These live in cargo-dist-generated code and a future `dist generate` would revert them: - on.push.tags used a regex-style pattern (`**[0-9]+.[0-9]+.[0-9]+*`), but GitHub `tags:` uses glob matching where `+` is literal, so it would not match `vX.Y.Z`. Use a glob that matches the project's v-prefixed semver tags. - actions/attest subject-path was built from `join(matrix.targets, ', ')`, producing one comma+space glob that matches nothing. Compute a newline-separated list of per-target globs (which the attest action accepts) in a bash step and pass it through. - The cyclonedx `find . -name '*.cdx.xml' -exec mv ... target/distrib/` also matched files already under target/distrib/, risking a self-move error. Prune that subtree with `-not -path './target/distrib/*'`. Co-Authored-By: Claude Opus 4.8 --- .github/workflows/release.yml | 54 ++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c92815c67..9add23f31 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,7 @@ on: pull_request: push: tags: - - '**[0-9]+.[0-9]+.[0-9]+*' + - 'v[0-9]*.[0-9]*.[0-9]*' jobs: # Run 'dist plan' (or host) to determine what tasks we need to do @@ -56,7 +56,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: persist-credentials: false submodules: recursive @@ -66,7 +66,7 @@ jobs: shell: bash run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.32.0/cargo-dist-installer.sh | sh" - name: Cache dist - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: cargo-dist-cache path: ~/.cargo/bin/dist @@ -82,7 +82,7 @@ jobs: cat plan-dist-manifest.json echo "manifest=$(jq -c "." plan-dist-manifest.json)" >> "$GITHUB_OUTPUT" - name: "Upload dist-manifest.json" - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: artifacts-plan-dist-manifest path: plan-dist-manifest.json @@ -120,7 +120,7 @@ jobs: - name: enable windows longpaths run: | git config --global core.longpaths true - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: persist-credentials: false submodules: recursive @@ -135,7 +135,7 @@ jobs: run: ${{ matrix.install_dist.run }} # Get the dist-manifest - name: Fetch local artifacts - uses: actions/download-artifact@v8 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: pattern: artifacts-* path: target/distrib/ @@ -148,10 +148,24 @@ jobs: # Actually do builds and make zips and whatnot dist build ${{ needs.plan.outputs.tag-flag }} --print=linkage --output-format=json ${{ matrix.dist_args }} > dist-manifest.json echo "dist ran successfully" + - id: attest-paths + name: Compute attestation subject paths + shell: bash + env: + TARGETS_JSON: ${{ toJson(matrix.targets) }} + run: | + # actions/attest accepts a newline-separated list of globs; emit one + # glob per target instead of a single comma-joined string that matches + # nothing. + { + echo "paths<> "$GITHUB_OUTPUT" - name: Attest - uses: actions/attest@v4 + uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4 with: - subject-path: "target/distrib/*${{ join(matrix.targets, ', ') }}*" + subject-path: "${{ steps.attest-paths.outputs.paths }}" - id: cargo-dist name: Post-build # We force bash here just because github makes it really hard to get values up @@ -166,7 +180,7 @@ jobs: cp dist-manifest.json "$BUILD_MANIFEST_NAME" - name: "Upload artifacts" - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: artifacts-build-local-${{ join(matrix.targets, '_') }} path: | @@ -183,12 +197,12 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} BUILD_MANIFEST_NAME: target/distrib/global-dist-manifest.json steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: persist-credentials: false submodules: recursive - name: Install cached dist - uses: actions/download-artifact@v8 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: name: cargo-dist-cache path: ~/.cargo/bin/ @@ -200,7 +214,7 @@ jobs: shell: bash # Get all the local artifacts for the global tasks to use (for e.g. checksums) - name: Fetch local artifacts - uses: actions/download-artifact@v8 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: pattern: artifacts-* path: target/distrib/ @@ -225,13 +239,13 @@ jobs: # Move all SBOM (.cdx.xml) files under target/distrib/ since # we expect all artifacts to be in that folder. - find . -name '*.cdx.xml' -exec mv '{}' target/distrib/ ';' + find . -name '*.cdx.xml' -not -path './target/distrib/*' -exec mv '{}' target/distrib/ ';' echo "paths<> "$GITHUB_OUTPUT" find . -name '*.cdx.xml' | tee -a "$GITHUB_OUTPUT" echo "EOF" >> "$GITHUB_OUTPUT" - name: "Upload artifacts" - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: name: artifacts-build-global path: | @@ -252,19 +266,19 @@ jobs: outputs: val: ${{ steps.host.outputs.manifest }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: persist-credentials: false submodules: recursive - name: Install cached dist - uses: actions/download-artifact@v8 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: name: cargo-dist-cache path: ~/.cargo/bin/ - run: chmod +x ~/.cargo/bin/dist # Fetch artifacts from scratch-storage - name: Fetch artifacts - uses: actions/download-artifact@v8 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: pattern: artifacts-* path: target/distrib/ @@ -277,14 +291,14 @@ jobs: cat dist-manifest.json echo "manifest=$(jq -c "." dist-manifest.json)" >> "$GITHUB_OUTPUT" - name: "Upload dist-manifest.json" - uses: actions/upload-artifact@v7 + uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7 with: # Overwrite the previous copy name: artifacts-dist-manifest path: dist-manifest.json # Create a GitHub Release while uploading all files to it - name: "Download GitHub Artifacts" - uses: actions/download-artifact@v8 + uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8 with: pattern: artifacts-* path: artifacts @@ -317,7 +331,7 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6 with: persist-credentials: false submodules: recursive From f882ff3a57355413017fac20116fb347acf4abab Mon Sep 17 00:00:00 2001 From: Jens Holdgaard Pedersen Date: Fri, 19 Jun 2026 23:58:44 +0200 Subject: [PATCH 3/5] ci: scope release.yml to least-privilege permissions Per Copilot review on #262: cargo-dist generates workflow-level contents: write, which would grant write to every job (incl. PR runs) and drop the repo's Token-Permissions posture. Narrow the top level to contents: read and grant contents: write only to the host job, which is the one that runs gh release create. (Reverts on dist generate; Renovate doesn't manage permissions, so this is a manual re-apply.) Co-Authored-By: Claude Opus 4.8 --- .github/workflows/release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9add23f31..ffadb4bb7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ name: Release permissions: - "contents": "write" + "contents": "read" # This task will run whenever you push a git tag that looks like a version # like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc. @@ -263,6 +263,11 @@ jobs: env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: "ubuntu-22.04" + # Only the host job creates the GitHub Release (`gh release create`), + # so it gets contents:write while the workflow default stays read + # (preserves the repo's Token-Permissions posture). + permissions: + "contents": "write" outputs: val: ${{ steps.host.outputs.manifest }} steps: From 9a0370ae2acc1784860217a14926199fb1aad0cc Mon Sep 17 00:00:00 2001 From: Jens Holdgaard Pedersen Date: Sat, 20 Jun 2026 00:17:00 +0200 Subject: [PATCH 4/5] ci: broaden release tag glob to match prereleases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Per Copilot review on #262: the v[0-9]*.[0-9]*.[0-9]* glob didn't reliably match prerelease tags (v0.1.0-rc.1), which cargo-dist supports and marks as GitHub prereleases. Use 'v[0-9]*' — any v-prefixed version tag, prereleases included. Co-Authored-By: Claude Opus 4.8 --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ffadb4bb7..b3db69934 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,7 +42,8 @@ on: pull_request: push: tags: - - 'v[0-9]*.[0-9]*.[0-9]*' + # Any v-prefixed version tag, including prereleases (v0.1.0-rc.1). + - 'v[0-9]*' jobs: # Run 'dist plan' (or host) to determine what tasks we need to do From 4354236f19c62fdfac5899252ceb493728fc23df Mon Sep 17 00:00:00 2001 From: Jens Holdgaard Pedersen Date: Sat, 20 Jun 2026 00:31:25 +0200 Subject: [PATCH 5/5] ci: allow-dirty=ci so dist plan tolerates the hand-edited workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The dist plan job failed (exit 255): cargo-dist's CI-consistency check diffs the committed release.yml against what it would regenerate, and our hand-pinned action SHAs (+ perms/tag/bug edits) make it differ. Set allow-dirty = ["ci"] — cargo-dist's documented escape hatch for a hand-customized CI file — so plan/generate no longer fail on the deviations. Co-Authored-By: Claude Opus 4.8 --- dist-workspace.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist-workspace.toml b/dist-workspace.toml index 7e5b68a21..52181be7e 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -7,6 +7,12 @@ members = ["cargo:."] cargo-dist-version = "0.32.0" # CI backends to support ci = "github" +# We hand-edit the generated `release.yml` to meet repo conventions +# (SHA-pinned actions, least-privilege per-job permissions, the v* tag +# glob, the attest subject-path / cyclonedx-find fixes). `allow-dirty` +# tells `dist plan`/`generate` not to fail on those deviations. Re-apply +# the edits if you ever regenerate. +allow-dirty = ["ci"] # The installers to generate for each app installers = ["shell"] # Target platforms to build apps for (Rust target-triple syntax). Ourios