From 17997bda27b45841c38cdc3849aa721ed5b405f9 Mon Sep 17 00:00:00 2001 From: ananas Date: Wed, 8 Oct 2025 18:16:27 +0100 Subject: [PATCH 1/2] fix release --- .github/workflows/release-rust.yml | 25 +++++++++++++++++-------- scripts/validate-packages.sh | 4 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-rust.yml b/.github/workflows/release-rust.yml index 15e1387b92..b62ad3c92b 100644 --- a/.github/workflows/release-rust.yml +++ b/.github/workflows/release-rust.yml @@ -5,11 +5,20 @@ on: types: [closed] branches: - main + workflow_dispatch: + inputs: + base_sha: + description: 'Base commit SHA' + required: false + default: 'a31725d0de490f83ffc3b51c16d46ab98bef6214' + head_sha: + description: 'Head commit SHA' + required: false + default: 'c448992824d6410e08d07e0af3e41e44b2ec746d' jobs: publish-release: - # Only run on merged release PRs - if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') + # Temporarily hardcoded to fix failed release runs-on: ubuntu-latest permissions: contents: write @@ -38,8 +47,8 @@ jobs: - name: Validate packages before publishing env: - BASE_SHA: ${{ github.event.pull_request.base.sha }} - HEAD_SHA: ${{ github.event.pull_request.head.sha }} + BASE_SHA: a31725d0de490f83ffc3b51c16d46ab98bef6214 + HEAD_SHA: c448992824d6410e08d07e0af3e41e44b2ec746d run: | echo "=========================================" echo "Phase 1: Validation (dry-run)" @@ -49,8 +58,8 @@ jobs: - name: Publish packages to crates.io env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - BASE_SHA: ${{ github.event.pull_request.base.sha }} - HEAD_SHA: ${{ github.event.pull_request.head.sha }} + BASE_SHA: a31725d0de490f83ffc3b51c16d46ab98bef6214 + HEAD_SHA: c448992824d6410e08d07e0af3e41e44b2ec746d run: | echo "" echo "=========================================" @@ -61,8 +70,8 @@ jobs: - name: Create GitHub releases env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BASE_SHA: ${{ github.event.pull_request.base.sha }} - HEAD_SHA: ${{ github.event.pull_request.head.sha }} + BASE_SHA: a31725d0de490f83ffc3b51c16d46ab98bef6214 + HEAD_SHA: c448992824d6410e08d07e0af3e41e44b2ec746d run: | echo "" echo "=========================================" diff --git a/scripts/validate-packages.sh b/scripts/validate-packages.sh index 4c541f0897..e4c06481d7 100755 --- a/scripts/validate-packages.sh +++ b/scripts/validate-packages.sh @@ -48,7 +48,7 @@ done echo "" if [ -n "$EXECUTE_FLAG" ]; then - echo "Running: cargo check (all packages) then cargo release publish $PACKAGE_ARGS --execute --no-confirm --no-verify" + echo "Running: cargo check (all packages) then cargo publish $PACKAGE_ARGS --no-verify" else echo "Running: cargo check (all packages) then cargo publish $PACKAGE_ARGS --dry-run --allow-dirty --no-verify" fi @@ -72,7 +72,7 @@ echo "" # Then: Either publish or dry-run if [ -n "$EXECUTE_FLAG" ]; then # Publish with --no-verify to avoid cargo bug with unpublished deps - cargo release publish $PACKAGE_ARGS --execute --no-confirm --no-verify + cargo publish $PACKAGE_ARGS --no-verify else # Dry-run validation - allow dirty state and skip verification cargo publish $PACKAGE_ARGS --dry-run --allow-dirty --no-verify From a35521fa334f9faeae1c53e33a0a23fccdfb3d5b Mon Sep 17 00:00:00 2001 From: ananas Date: Wed, 8 Oct 2025 18:32:46 +0100 Subject: [PATCH 2/2] fix: use cargo publish instead of cargo release - Replace 'cargo release publish' with 'cargo publish' in validate-packages.sh - cargo-release was removed in commit c7227bae0 - Revert workflow to use PR event data (not hardcoded commits) --- .github/workflows/release-rust.yml | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release-rust.yml b/.github/workflows/release-rust.yml index b62ad3c92b..15e1387b92 100644 --- a/.github/workflows/release-rust.yml +++ b/.github/workflows/release-rust.yml @@ -5,20 +5,11 @@ on: types: [closed] branches: - main - workflow_dispatch: - inputs: - base_sha: - description: 'Base commit SHA' - required: false - default: 'a31725d0de490f83ffc3b51c16d46ab98bef6214' - head_sha: - description: 'Head commit SHA' - required: false - default: 'c448992824d6410e08d07e0af3e41e44b2ec746d' jobs: publish-release: - # Temporarily hardcoded to fix failed release + # Only run on merged release PRs + if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') runs-on: ubuntu-latest permissions: contents: write @@ -47,8 +38,8 @@ jobs: - name: Validate packages before publishing env: - BASE_SHA: a31725d0de490f83ffc3b51c16d46ab98bef6214 - HEAD_SHA: c448992824d6410e08d07e0af3e41e44b2ec746d + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | echo "=========================================" echo "Phase 1: Validation (dry-run)" @@ -58,8 +49,8 @@ jobs: - name: Publish packages to crates.io env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - BASE_SHA: a31725d0de490f83ffc3b51c16d46ab98bef6214 - HEAD_SHA: c448992824d6410e08d07e0af3e41e44b2ec746d + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | echo "" echo "=========================================" @@ -70,8 +61,8 @@ jobs: - name: Create GitHub releases env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BASE_SHA: a31725d0de490f83ffc3b51c16d46ab98bef6214 - HEAD_SHA: c448992824d6410e08d07e0af3e41e44b2ec746d + BASE_SHA: ${{ github.event.pull_request.base.sha }} + HEAD_SHA: ${{ github.event.pull_request.head.sha }} run: | echo "" echo "========================================="