From be3489643393a507463b8a4d874897c02157ec24 Mon Sep 17 00:00:00 2001 From: Lukas Wirth Date: Wed, 13 Apr 2022 12:26:24 +0200 Subject: [PATCH] minor: prepare CI for rust-lang move --- .github/workflows/ci.yaml | 6 +++--- .github/workflows/metrics.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- .github/workflows/rustdoc.yaml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index baefd8bc1f0..d1048bd3549 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,7 +17,7 @@ env: jobs: rust: - if: github.repository == 'rust-analyzer/rust-analyzer' + if: github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer' name: Rust runs-on: ${{ matrix.os }} env: @@ -62,7 +62,7 @@ jobs: # Weird targets to catch non-portable code rust-cross: - if: github.repository == 'rust-analyzer/rust-analyzer' + if: github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer' name: Rust Cross runs-on: ubuntu-latest @@ -99,7 +99,7 @@ jobs: done typescript: - if: github.repository == 'rust-analyzer/rust-analyzer' + if: github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer' name: TypeScript strategy: fail-fast: false diff --git a/.github/workflows/metrics.yaml b/.github/workflows/metrics.yaml index f4412ef6570..c09642868d2 100644 --- a/.github/workflows/metrics.yaml +++ b/.github/workflows/metrics.yaml @@ -12,7 +12,7 @@ env: jobs: metrics: - if: github.repository == 'rust-analyzer/rust-analyzer' + if: github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer' runs-on: ubuntu-latest steps: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4ee7add1de3..b1da9216107 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -247,12 +247,12 @@ jobs: working-directory: ./editors/code - name: Publish Extension (release) - if: github.ref == 'refs/heads/release' && github.repository == 'rust-analyzer/rust-analyzer' + if: github.ref == 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer') working-directory: ./editors/code # token from https://dev.azure.com/rust-analyzer/ run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix - name: Publish Extension (nightly) - if: github.ref != 'refs/heads/release' && github.repository == 'rust-analyzer/rust-analyzer' + if: github.ref != 'refs/heads/release' && (github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer') working-directory: ./editors/code run: npx vsce publish --pat ${{ secrets.MARKETPLACE_TOKEN }} --packagePath ../../dist/rust-analyzer-*.vsix --pre-release diff --git a/.github/workflows/rustdoc.yaml b/.github/workflows/rustdoc.yaml index ac69adb9477..eccc7d6858b 100644 --- a/.github/workflows/rustdoc.yaml +++ b/.github/workflows/rustdoc.yaml @@ -12,7 +12,7 @@ env: jobs: rustdoc: - if: github.repository == 'rust-analyzer/rust-analyzer' + if: github.repository == 'rust-analyzer/rust-analyzer' || github.repository == 'rust-lang/rust-analyzer' runs-on: ubuntu-latest steps: