Remove redundant install Rust steps

Those were not installing Rust but configuring it via rustup, and
those configurations were done on `stable` toolchain which is not what we use (see rust-toolchain.toml)

co-authored-by: Piotr <piotr@zed.dev>
This commit is contained in:
Kirill Bulatov 2024-01-11 14:01:42 +02:00
parent a5dd2535f1
commit 41bc49af36
7 changed files with 47 additions and 77 deletions

View File

@ -4,12 +4,6 @@ description: "Checks code formatting use cargo fmt"
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Install Rust
shell: bash -euxo pipefail {0}
run: |
rustup set profile minimal
rustup update stable
- name: cargo fmt - name: cargo fmt
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: cargo fmt --all -- --check run: cargo fmt --all -- --check

View File

@ -2,29 +2,26 @@ name: "Run tests"
description: "Runs the tests" description: "Runs the tests"
runs: runs:
using: "composite" using: "composite"
steps: steps:
- name: Install Rust - name: Install Rust
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: | run: |
rustup set profile minimal cargo install cargo-nextest
rustup update stable
rustup target add wasm32-wasi
cargo install cargo-nextest
- name: Install Node - name: Install Node
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: "18" node-version: "18"
- name: Limit target directory size - name: Limit target directory size
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: script/clear-target-dir-if-larger-than 100 run: script/clear-target-dir-if-larger-than 100
- name: Run check - name: Run check
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: cargo check --tests --workspace run: cargo check --tests --workspace
- name: Run tests - name: Run tests
shell: bash -euxo pipefail {0} shell: bash -euxo pipefail {0}
run: cargo nextest run --workspace --no-fail-fast run: cargo nextest run --workspace --no-fail-fast

View File

@ -76,14 +76,6 @@ jobs:
APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }} APPLE_NOTARIZATION_USERNAME: ${{ secrets.APPLE_NOTARIZATION_USERNAME }}
APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }} APPLE_NOTARIZATION_PASSWORD: ${{ secrets.APPLE_NOTARIZATION_PASSWORD }}
steps: steps:
- name: Install Rust
run: |
rustup set profile minimal
rustup update stable
rustup target add aarch64-apple-darwin
rustup target add x86_64-apple-darwin
rustup target add wasm32-wasi
- name: Install Node - name: Install Node
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:

View File

@ -3,41 +3,36 @@ name: Randomized Tests
concurrency: randomized-tests concurrency: randomized-tests
on: on:
push: push:
branches: branches:
- randomized-tests-runner - randomized-tests-runner
# schedule: # schedule:
# - cron: '0 * * * *' # - cron: '0 * * * *'
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
CARGO_INCREMENTAL: 0 CARGO_INCREMENTAL: 0
RUST_BACKTRACE: 1 RUST_BACKTRACE: 1
ZED_SERVER_URL: https://zed.dev ZED_SERVER_URL: https://zed.dev
ZED_CLIENT_SECRET_TOKEN: ${{ secrets.ZED_CLIENT_SECRET_TOKEN }} ZED_CLIENT_SECRET_TOKEN: ${{ secrets.ZED_CLIENT_SECRET_TOKEN }}
jobs: jobs:
tests: tests:
name: Run randomized tests name: Run randomized tests
runs-on: runs-on:
- self-hosted - self-hosted
- randomized-tests - randomized-tests
steps: steps:
- name: Install Rust - name: Install Node
run: | uses: actions/setup-node@v3
rustup set profile minimal with:
rustup update stable node-version: "18"
- name: Install Node - name: Checkout repo
uses: actions/setup-node@v3 uses: actions/checkout@v3
with: with:
node-version: '18' clean: false
submodules: "recursive"
- name: Checkout repo - name: Run randomized tests
uses: actions/checkout@v3 run: script/randomized-test-ci
with:
clean: false
submodules: 'recursive'
- name: Run randomized tests
run: script/randomized-test-ci

View File

@ -60,14 +60,6 @@ jobs:
DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }} DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
steps: steps:
- name: Install Rust
run: |
rustup set profile minimal
rustup update stable
rustup target add aarch64-apple-darwin
rustup target add x86_64-apple-darwin
rustup target add wasm32-wasi
- name: Install Node - name: Install Node
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:

View File

@ -8242,7 +8242,6 @@ pub(crate) fn update_test_project_settings(
} }
pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) { pub(crate) fn init_test(cx: &mut TestAppContext, f: fn(&mut AllLanguageSettingsContent)) {
dbg!("(???????????");
_ = cx.update(|cx| { _ = cx.update(|cx| {
let store = SettingsStore::test(cx); let store = SettingsStore::test(cx);
cx.set_global(store); cx.set_global(store);

View File

@ -1,4 +1,5 @@
[toolchain] [toolchain]
channel = "1.75" channel = "1.75"
profile = "minimal"
components = [ "rustfmt", "clippy" ] components = [ "rustfmt", "clippy" ]
targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ] targets = [ "x86_64-apple-darwin", "aarch64-apple-darwin", "wasm32-wasi" ]