diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-23 08:38:29 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-23 08:38:29 +0000 |
| commit | 8aa2eb76dcff1f508dfbad03016d9dd45c3ce32d (patch) | |
| tree | e7db7122f9fdeb0eaa8a9616dc2e09c39514129c | |
| parent | 5e005cd91e3582808e8af9b14dcbe2b2874ba093 (diff) | |
| parent | 2707dc384d8a25ed35c33b0185201ad48b086cdf (diff) | |
| download | rust-8aa2eb76dcff1f508dfbad03016d9dd45c3ce32d.tar.gz rust-8aa2eb76dcff1f508dfbad03016d9dd45c3ce32d.zip | |
Merge #7014
7014: Set RA_TARGET at job level r=lnicola a=lnicola bors r+ Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
| -rw-r--r-- | .github/workflows/release.yaml | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 75483b47702..7b9fbe6b80b 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -18,6 +18,8 @@ jobs: dist-windows: name: dist (Windows) runs-on: windows-latest + env: + RA_TARGET: x86_64-pc-windows-msvc steps: - name: Checkout repository @@ -39,8 +41,6 @@ jobs: - name: Dist run: cargo xtask dist - env: - RA_TARGET: x86_64-pc-windows-msvc - name: Upload artifacts uses: actions/upload-artifact@v1 @@ -51,6 +51,8 @@ jobs: dist-ubuntu: name: dist (Ubuntu 16.04) runs-on: ubuntu-16.04 + env: + RA_TARGET: x86_64-unknown-linux-gnu steps: - name: Checkout repository @@ -71,18 +73,14 @@ jobs: - name: Dist if: github.ref == 'refs/heads/release' run: cargo xtask dist --client 0.2.$GITHUB_RUN_NUMBER - env: - RA_TARGET: x86_64-unknown-linux-gnu - name: Dist if: github.ref != 'refs/heads/release' run: cargo xtask dist --nightly --client 0.3.$GITHUB_RUN_NUMBER-nightly - env: - RA_TARGET: x86_64-unknown-linux-gnu - name: Nightly analysis-stats check if: github.ref != 'refs/heads/release' - run: target/x86_64-unknown-linux-gnu/release/rust-analyzer analysis-stats . + run: target/${{ env.RA_TARGET }}/release/rust-analyzer analysis-stats . - name: Upload artifacts uses: actions/upload-artifact@v1 @@ -93,6 +91,8 @@ jobs: dist-macos-latest: name: dist (MacOS latest) runs-on: macos-latest + env: + RA_TARGET: x86_64-apple-darwin steps: - name: Checkout repository @@ -107,8 +107,6 @@ jobs: - name: Dist run: cargo xtask dist - env: - RA_TARGET: x86_64-apple-darwin - name: Upload artifacts uses: actions/upload-artifact@v1 @@ -119,6 +117,8 @@ jobs: dist-macos-11: name: dist (MacOS 11.0) runs-on: macos-11.0 + env: + RA_TARGET: aarch64-apple-darwin steps: - name: Checkout repository @@ -134,8 +134,6 @@ jobs: - name: Dist run: cargo xtask dist - env: - RA_TARGET: aarch64-apple-darwin - name: Upload artifacts uses: actions/upload-artifact@v1 |