From c50d70aa354b12f6559ae717fc1d4c2252b1a0bd Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Wed, 11 Oct 2023 23:31:49 +0900 Subject: [PATCH] ci: Use taiki-e/github-actions/.github/workflows/release-dry-run.yml --- .github/workflows/ci.yml | 49 ++--------------------------------- .github/workflows/release.yml | 4 +-- 2 files changed, 3 insertions(+), 50 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10b4a61a..6b104028 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,8 @@ jobs: uses: taiki-e/github-actions/.github/workflows/msrv.yml@main with: event_name: ${{ github.event_name }} + release-dry-run: + uses: taiki-e/github-actions/.github/workflows/release-dry-run.yml@main tidy: uses: taiki-e/github-actions/.github/workflows/tidy.yml@main @@ -98,53 +100,6 @@ jobs: - run: cargo hack build --workspace --no-private --feature-powerset --no-dev-deps - run: cargo minimal-versions build --workspace --no-private --all-features - # NB: sync with upload-assets job in release.yml. - build: - name: build (${{ matrix.target }}) - strategy: - fail-fast: false - matrix: - include: - - target: aarch64-unknown-linux-gnu - - target: aarch64-unknown-linux-musl - - target: aarch64-apple-darwin - os: macos-11 - - target: x86_64-unknown-linux-gnu - - target: x86_64-unknown-linux-musl - - target: x86_64-apple-darwin - os: macos-11 - - target: x86_64-pc-windows-msvc - os: windows-2019 - - target: universal-apple-darwin - os: macos-11 - runs-on: ${{ matrix.os || 'ubuntu-20.04' }} - timeout-minutes: 60 - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Install Rust - run: rustup update stable --no-self-update - - uses: taiki-e/setup-cross-toolchain-action@v1 - with: - target: ${{ matrix.target }} - - run: echo "RUSTFLAGS=${RUSTFLAGS} -C target-feature=+crt-static" >>"${GITHUB_ENV}" - if: endsWith(matrix.target, 'windows-msvc') - - uses: taiki-e/upload-rust-binary-action@v1 - with: - dry-run: true - bin: cargo-llvm-cov - target: ${{ matrix.target }} - tar: all - zip: windows - ref: refs/tags/dummy - token: dummy - # For debugging - - uses: actions/upload-artifact@v3 - with: - name: ${{ matrix.target }} - path: cargo-llvm-cov-${{ matrix.target }}.* - miri: runs-on: ubuntu-latest timeout-minutes: 60 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f580b879..11a5536a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,12 +45,10 @@ jobs: env: CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }} - # NB: sync with build job in ci.yml. upload-assets: name: ${{ matrix.target }} if: github.repository_owner == 'taiki-e' - needs: - - create-release + needs: create-release strategy: matrix: include: