diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0586e6995..f19cefcb8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: # 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.30.1/cargo-dist-installer.sh | sh" + run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.30.0/cargo-dist-installer.sh | sh" - name: Cache dist uses: actions/upload-artifact@6027e3dd177782cd8ab9af838c04fd81a07f1d47 with: @@ -168,17 +168,13 @@ jobs: - custom-build-binaries - custom-build-docker - 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.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }} + # Only run if we're "publishing", and only if local and global didn't fail (skipped is fine) + if: ${{ always() && needs.plan.outputs.publishing == 'true' && (needs.build-global-artifacts.result == 'skipped' || needs.build-global-artifacts.result == 'success') && (needs.custom-build-binaries.result == 'skipped' || needs.custom-build-binaries.result == 'success') && (needs.custom-build-docker.result == 'skipped' || needs.custom-build-docker.result == 'success') }} env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} runs-on: "depot-ubuntu-latest-4" outputs: val: ${{ steps.host.outputs.manifest }} - permissions: - "attestations": "write" - "contents": "write" - "id-token": "write" steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: @@ -255,15 +251,6 @@ jobs: run: | # Remove the granular manifests rm -f artifacts/*-dist-manifest.json - - name: Attest - uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 - with: - subject-path: | - artifacts/*.json - artifacts/*.sh - artifacts/*.ps1 - artifacts/*.zip - artifacts/*.tar.gz - name: Create GitHub Release env: PRERELEASE_FLAG: "${{ fromJson(needs.host.outputs.val).announcement_is_prerelease && '--prerelease' || '' }}" diff --git a/dist-workspace.toml b/dist-workspace.toml index 9e79d39c1..c7493e920 100644 --- a/dist-workspace.toml +++ b/dist-workspace.toml @@ -4,7 +4,7 @@ members = ["cargo:."] # Config for 'dist' [dist] # The preferred dist version to use in CI (Cargo.toml SemVer syntax) -cargo-dist-version = "0.30.1" +cargo-dist-version = "0.30.0" # Whether to consider the binaries in a package for distribution (defaults true) dist = false # CI backends to support @@ -46,12 +46,6 @@ pr-run-mode = "plan" dispatch-releases = true # Which phase dist should use to create the GitHub release github-release = "announce" -# Whether to enable GitHub Attestations -github-attestations = true -# When to generate GitHub Attestations -github-attestations-phase = "host" -# Patterns to attest when creating attestations for release artifacts -github-attestations-filters = ["*.json", "*.sh", "*.ps1", "*.zip", "*.tar.gz"] # Whether CI should include auto-generated code to build local artifacts build-local-artifacts = false # Local artifacts jobs to run in CI