From b030a1860bc63bf418a423d05aafc44419d6913c Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Fri, 13 Jan 2023 21:32:50 +0100 Subject: [PATCH] Add self hosted runner to ci.yml (#955) * Add self hosted runner to ci.yml * Remove libgtk install * Use mold as the linker * Make build logs non verbose * Fix crash on failure to get GLOBAL_PLATFORM * Copy the platform enum before calling unwrap_or_default Co-authored-by: 0hypercube <0hypercube@gmail.com> --- .github/workflows/ci.yml | 11 ++++------- editor/src/dispatcher.rs | 2 +- .../input_mapper/utility_types/input_keyboard.rs | 4 ++-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b206989..5cc05a07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ env: jobs: build: - runs-on: ubuntu-latest + runs-on: self-hosted steps: - uses: actions/checkout@v2 @@ -27,9 +27,6 @@ jobs: cd frontend npm ci - - name: ๐Ÿ”ง Install libgtk - run: sudo apt update -y && sudo apt install -y libgtk-3-dev libssl-dev build-essential curl wget libayatana-appindicator3-dev librsvg2-dev libsoup2.4-dev libjavascriptcoregtk-4.0-dev libwebkit2gtk-4.0-dev - - name: ๐Ÿ”ผ Update Rust to latest stable run: | rustc --version @@ -53,15 +50,15 @@ jobs: - name: ๐Ÿ”ฌ Check Rust formatting run: | - cargo fmt --all -- --check + mold -run cargo fmt --all -- --check - name: ๐Ÿฆ€ Build Rust code run: | - cargo build --verbose + mold -run cargo build - name: ๐Ÿงช Run Rust tests run: | - cargo test --verbose + mold -run cargo test cargo-deny: runs-on: ubuntu-latest diff --git a/editor/src/dispatcher.rs b/editor/src/dispatcher.rs index 1ec85dd8..0af0f2e8 100644 --- a/editor/src/dispatcher.rs +++ b/editor/src/dispatcher.rs @@ -141,7 +141,7 @@ impl Dispatcher { .process_message(message, (&self.message_handlers.input_preprocessor_message_handler, actions), &mut queue); } InputPreprocessor(message) => { - let keyboard_platform = GLOBAL_PLATFORM.get().expect("Failed to get GLOBAL_PLATFORM").as_keyboard_platform_layout(); + let keyboard_platform = GLOBAL_PLATFORM.get().copied().unwrap_or_default().as_keyboard_platform_layout(); self.message_handlers.input_preprocessor_message_handler.process_message(message, keyboard_platform, &mut queue); } diff --git a/editor/src/messages/input_mapper/utility_types/input_keyboard.rs b/editor/src/messages/input_mapper/utility_types/input_keyboard.rs index 26db4594..800130d0 100644 --- a/editor/src/messages/input_mapper/utility_types/input_keyboard.rs +++ b/editor/src/messages/input_mapper/utility_types/input_keyboard.rs @@ -224,7 +224,7 @@ impl fmt::Display for Key { return write!(f, "{}", key_name.chars().skip(KEY_PREFIX.len()).collect::()); } - let keyboard_layout = || GLOBAL_PLATFORM.get().expect("Failed to get GLOBAL_PLATFORM").as_keyboard_platform_layout(); + let keyboard_layout = || GLOBAL_PLATFORM.get().copied().unwrap_or_default().as_keyboard_platform_layout(); let name = match self { // Writing system keys @@ -338,7 +338,7 @@ impl fmt::Display for KeysGroup { .0 .iter() .map(|key| { - let keyboard_layout = GLOBAL_PLATFORM.get().expect("Failed to get GLOBAL_PLATFORM").as_keyboard_platform_layout(); + let keyboard_layout = GLOBAL_PLATFORM.get().copied().unwrap_or_default().as_keyboard_platform_layout(); let key_is_modifier = matches!(*key, Key::Control | Key::Command | Key::Alt | Key::Shift | Key::Meta | Key::Accel); if keyboard_layout == KeyboardPlatformLayout::Mac && key_is_modifier {