From 2fbcf188a70386862d799d8c016ac07d15b2f08a Mon Sep 17 00:00:00 2001 From: Jiahao XU Date: Tue, 8 Aug 2023 20:45:40 +1000 Subject: [PATCH] Revert "Use `rust-lld` in CI" (#1257) Revert "Use `rust-lld` in CI (#1253)" This reverts commit 1e4e0d166d2aa1a9679090ae6b98e4a486849217. Signed-off-by: Jiahao XU --- .github/workflows/ci.yml | 17 ----------------- .github/workflows/release-build.yml | 8 -------- 2 files changed, 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edbef9e9..e1537371 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -38,18 +38,11 @@ jobs: os: windows-latest runs-on: ${{ matrix.os }} - defaults: - run: - shell: bash env: CARGO_BUILD_TARGET: ${{ matrix.target }} steps: - uses: actions/checkout@v3 - - name: Use rust-lld - run: | - echo "CARGO_TARGET_${CARGO_BUILD_TARGET}_LINKER=rust-lld" >> "$GITHUB_ENV" - - uses: ./.github/actions/just-setup env: # just-setup use binstall to install sccache, @@ -81,17 +74,10 @@ jobs: - target: aarch64-pc-windows-msvc os: windows-latest runs-on: ${{ matrix.os }} - defaults: - run: - shell: bash env: CARGO_BUILD_TARGET: ${{ matrix.target }} steps: - uses: actions/checkout@v3 - - name: Use rust-lld - run: | - echo "CARGO_TARGET_${CARGO_BUILD_TARGET}_LINKER=rust-lld" >> "$GITHUB_ENV" - - uses: ./.github/actions/just-setup with: tools: cargo-hack @@ -121,9 +107,6 @@ jobs: os: windows-latest runs-on: ${{ matrix.os }} - defaults: - run: - shell: bash steps: - uses: actions/checkout@v3 - uses: ./.github/actions/just-setup diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index a319e0db..742e7288 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -42,9 +42,6 @@ jobs: name: ${{ matrix.t }} runs-on: ${{ matrix.o }} - defaults: - run: - shell: bash env: CARGO_BUILD_TARGET: ${{ matrix.t }} GLIBC_VERSION: ${{ matrix.g }} @@ -63,10 +60,6 @@ jobs: if: inputs.CARGO_PROFILE_RELEASE_CODEGEN_UNITS run: echo "CARGO_PROFILE_RELEASE_CODEGEN_UNITS=${{ inputs.CARGO_PROFILE_RELEASE_CODEGEN_UNITS }}" >> "$GITHUB_ENV" - - name: Use rust-lld - run: | - echo "CARGO_TARGET_${CARGO_BUILD_TARGET}_LINKER=rust-lld" >> "$GITHUB_ENV" - - uses: ./.github/actions/just-setup with: tools: cargo-auditable @@ -80,7 +73,6 @@ jobs: - run: just package - if: runner.os == 'Windows' - shell: pwsh run: Get-ChildItem packages/ - if: runner.os != 'Windows' run: ls -shal packages/