Skip to content

Commit c086a37

Browse files
authored
Revert "Use gh workflow for tests (#41384)"
This reverts commit 4adff4a.
1 parent 16d84a3 commit c086a37

25 files changed

+125
-1124
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@ name: CI
22

33
on:
44
push:
5+
branches:
6+
- main
7+
- "v[0-9]+.[0-9]+.x"
58
tags:
69
- "v*"
710

11+
pull_request:
12+
branches:
13+
- "**"
14+
815
concurrency:
916
# Allow only one workflow per any non-`main` branch.
1017
group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
@@ -266,12 +273,15 @@ jobs:
266273
uses: ./.github/actions/run_tests
267274

268275
- name: Build collab
269-
# we should do this on a linux x86 machinge
270276
run: cargo build -p collab
271277

272278
- name: Build other binaries and features
273279
run: |
274-
cargo build --workspace --bins --examples
280+
cargo build --workspace --bins --all-features
281+
cargo check -p gpui --features "macos-blade"
282+
cargo check -p workspace
283+
cargo build -p remote_server
284+
cargo check -p gpui --examples
275285
276286
# Since the macOS runners are stateful, so we need to remove the config file to prevent potential bug.
277287
- name: Clean CI config file
@@ -721,6 +731,10 @@ jobs:
721731
(contains(github.event.pull_request.labels.*.name, 'run-nix') ||
722732
needs.job_spec.outputs.run_nix == 'true')
723733
secrets: inherit
734+
with:
735+
flake-output: debug
736+
# excludes the final package to only cache dependencies
737+
cachix-filter: "-zed-editor-[0-9.]*-nightly"
724738

725739
bundle-windows-x64:
726740
timeout-minutes: 120

.github/workflows/nix_build.yml

Lines changed: 11 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,14 @@
11
# Generated from xtask::workflows::nix_build
22
# Rebuild with `cargo xtask workflows`.
33
name: nix_build
4-
env:
5-
CARGO_TERM_COLOR: always
6-
RUST_BACKTRACE: '1'
7-
CARGO_INCREMENTAL: '0'
84
on:
9-
pull_request:
10-
branches:
11-
- '**'
12-
paths:
13-
- nix/**
14-
- flake.*
15-
- Cargo.*
16-
- rust-toolchain.toml
17-
- .cargo/config.toml
18-
push:
19-
branches:
20-
- main
21-
- v[0-9]+.[0-9]+.x
22-
paths:
23-
- nix/**
24-
- flake.*
25-
- Cargo.*
26-
- rust-toolchain.toml
27-
- .cargo/config.toml
28-
workflow_call: {}
5+
workflow_call:
6+
inputs:
7+
flake-output:
8+
type: string
9+
default: default
10+
cachix-filter:
11+
type: string
2912
jobs:
3013
build_nix_linux_x86_64:
3114
if: github.repository_owner == 'zed-industries'
@@ -50,9 +33,9 @@ jobs:
5033
name: zed
5134
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
5235
cachixArgs: -v
53-
pushFilter: -zed-editor-[0-9.]*-nightly
36+
pushFilter: ${{ inputs.cachix-filter }}
5437
- name: nix_build::build
55-
run: nix build .#debug -L --accept-flake-config
38+
run: nix build .#${{ inputs.flake-output }} -L --accept-flake-config
5639
shell: bash -euxo pipefail {0}
5740
timeout-minutes: 60
5841
continue-on-error: true
@@ -80,9 +63,9 @@ jobs:
8063
name: zed
8164
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
8265
cachixArgs: -v
83-
pushFilter: -zed-editor-[0-9.]*-nightly
66+
pushFilter: ${{ inputs.cachix-filter }}
8467
- name: nix_build::build
85-
run: nix build .#debug -L --accept-flake-config
68+
run: nix build .#${{ inputs.flake-output }} -L --accept-flake-config
8669
shell: bash -euxo pipefail {0}
8770
- name: nix_build::limit_store
8871
run: |-
@@ -92,6 +75,3 @@ jobs:
9275
shell: bash -euxo pipefail {0}
9376
timeout-minutes: 60
9477
continue-on-error: true
95-
concurrency:
96-
group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
97-
cancel-in-progress: true

.github/workflows/release_nightly.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ jobs:
4949
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
5050
with:
5151
node-version: '20'
52-
- name: steps::clippy
53-
run: ./script/clippy
54-
shell: bash -euxo pipefail {0}
5552
- name: steps::cargo_install_nextest
5653
run: cargo install cargo-nextest --locked
5754
shell: bash -euxo pipefail {0}
@@ -84,9 +81,6 @@ jobs:
8481
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020
8582
with:
8683
node-version: '20'
87-
- name: steps::clippy
88-
run: ./script/clippy.ps1
89-
shell: pwsh
9084
- name: steps::cargo_install_nextest
9185
run: cargo install cargo-nextest --locked
9286
shell: pwsh

.github/workflows/run_action_checks.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.github/workflows/run_bundling.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ jobs:
109109
uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
110110
with:
111111
token: ${{ secrets.SENTRY_AUTH_TOKEN }}
112-
- name: steps::setup_linux
112+
- name: ./script/linux
113113
run: ./script/linux
114114
shell: bash -euxo pipefail {0}
115-
- name: steps::install_mold
115+
- name: ./script/install-mold
116116
run: ./script/install-mold
117117
shell: bash -euxo pipefail {0}
118118
- name: ./script/bundle-linux
@@ -143,12 +143,9 @@ jobs:
143143
uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
144144
with:
145145
token: ${{ secrets.SENTRY_AUTH_TOKEN }}
146-
- name: steps::setup_linux
146+
- name: ./script/linux
147147
run: ./script/linux
148148
shell: bash -euxo pipefail {0}
149-
- name: steps::install_mold
150-
run: ./script/install-mold
151-
shell: bash -euxo pipefail {0}
152149
- name: ./script/bundle-linux
153150
run: ./script/bundle-linux
154151
shell: bash -euxo pipefail {0}

.github/workflows/run_docs_checks.yml

Lines changed: 0 additions & 68 deletions
This file was deleted.

.github/workflows/run_license_checks.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/workflows/run_style_checks.yml

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)