Compare commits

...

1 Commits

Author SHA1 Message Date
Mikayla Maki
8b55cb40c1 Restore test running 2024-05-29 19:38:00 -07:00
5 changed files with 7 additions and 13 deletions

View File

@@ -99,7 +99,6 @@ jobs:
- name: Build other binaries and features - name: Build other binaries and features
run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade" run: cargo build --workspace --bins --all-features; cargo check -p gpui --features "macos-blade"
# todo(linux): Actually run the tests
linux_tests: linux_tests:
name: (Linux) Run Clippy and tests name: (Linux) Run Clippy and tests
runs-on: runs-on:
@@ -117,6 +116,9 @@ jobs:
- name: cargo clippy - name: cargo clippy
run: cargo xtask clippy run: cargo xtask clippy
- name: Run tests
uses: ./.github/actions/run_tests
- name: Build Zed - name: Build Zed
run: cargo build -p zed run: cargo build -p zed

2
Cargo.lock generated
View File

@@ -3391,7 +3391,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [ dependencies = [
"libloading 0.7.4", "libloading 0.8.0",
] ]
[[package]] [[package]]

View File

@@ -494,10 +494,5 @@ non_canonical_partial_ord_impl = "allow"
reversed_empty_ranges = "allow" reversed_empty_ranges = "allow"
type_complexity = "allow" type_complexity = "allow"
[workspace.lints.rust]
unexpected_cfgs = { level = "warn", check-cfg = [
'cfg(gles)', # used in gpui
] }
[workspace.metadata.cargo-machete] [workspace.metadata.cargo-machete]
ignored = ["bindgen", "cbindgen", "prost_build", "serde"] ignored = ["bindgen", "cbindgen", "prost_build", "serde"]

View File

@@ -572,7 +572,8 @@ async fn test_save_as_remote(cx1: &mut gpui::TestAppContext, cx2: &mut gpui::Tes
let title = remote_workspace let title = remote_workspace
.update(&mut cx, |ws, cx| { .update(&mut cx, |ws, cx| {
ws.active_item(cx).unwrap().tab_description(0, &cx).unwrap() let active_item = ws.active_item(cx).unwrap();
active_item.tab_description(0, &cx).unwrap()
}) })
.unwrap(); .unwrap();

View File

@@ -277,11 +277,7 @@ impl TestServer {
node_runtime: FakeNodeRuntime::new(), node_runtime: FakeNodeRuntime::new(),
}); });
let os_keymap = if cfg!(target_os = "linux") { let os_keymap = "keymaps/default-macos.json";
"keymaps/default-linux.json"
} else {
"keymaps/default-macos.json"
};
cx.update(|cx| { cx.update(|cx| {
theme::init(theme::LoadThemes::JustBase, cx); theme::init(theme::LoadThemes::JustBase, cx);