From 540fa79c6b2dcdf5ab8efd84530e18f6c8a9994c Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Fri, 14 Jun 2024 21:33:20 +1000 Subject: [PATCH] CI: Fix publish (#1760) * Fix publish in release-cli.yml Using latest stable rust Signed-off-by: Jiahao XU * Fix publish in release.yml Use latest stable rust Signed-off-by: Jiahao XU * Run release-dry-run in merge queue only Running it twice on PR pipeline and merge queue pipeline only wastes time and causes rate limit. For PR that modifies release-dry-run and wants to test it, they can temporarily run release-dry-run on PR pipeline. Signed-off-by: Jiahao XU --------- Signed-off-by: Jiahao XU --- .github/workflows/ci.yml | 17 +---------------- .github/workflows/release-cli.yml | 2 ++ .github/workflows/release.yml | 1 + 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 73496d8b..7a61dbaa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -190,24 +190,9 @@ jobs: - run: just avoid-dev-deps - run: just lint - pr-info: - outputs: - is-release: ${{ steps.meta.outputs.is-release }} - crate: ${{ steps.meta.outputs.crates-names }} - - runs-on: ubuntu-latest - steps: - - id: meta - if: github.event_name == 'pull_request' - uses: cargo-bins/release-meta@v1 - with: - event-data: ${{ toJSON(github.event) }} - extract-notes-under: "### Release notes" - release-dry-run: - needs: pr-info uses: ./.github/workflows/release-cli.yml - if: github.event_name != 'pull_request' || needs.pr-info.outputs.is-release == 'true' + if: github.event_name != 'pull_request' secrets: inherit with: info: | diff --git a/.github/workflows/release-cli.yml b/.github/workflows/release-cli.yml index 7e5f16ed..a92f7b13 100644 --- a/.github/workflows/release-cli.yml +++ b/.github/workflows/release-cli.yml @@ -83,6 +83,8 @@ jobs: with: name: minisign.pub + - run: rustup toolchain install stable --no-self-update --profile minimal + - run: .github/scripts/ephemeral-crate.sh - if: fromJSON(inputs.info).is-release != 'true' && fromJSON(inputs.info).crate != '' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 997fc89f..c8131abb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,6 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - run: rustup toolchain install stable --no-self-update --profile minimal - name: Push lib release tag if: needs.info.outputs.crate != 'cargo-binstall' uses: mathieudutour/github-tag-action@v6.2