Merge #11974
11974: minor: prepare CI for rust-lang move r=Veykril a=Veykril
bors r+
Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index baefd8b..d1048bd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -17,7 +17,7 @@
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 @@
# 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 @@
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 f4412ef..c096428 100644
--- a/.github/workflows/metrics.yaml
+++ b/.github/workflows/metrics.yaml
@@ -12,7 +12,7 @@
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 4ee7add..b1da921 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -247,12 +247,12 @@
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 ac69adb..eccc7d6 100644
--- a/.github/workflows/rustdoc.yaml
+++ b/.github/workflows/rustdoc.yaml
@@ -12,7 +12,7 @@
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:
