From 9cf8d2cd053f14ddc19a26fee7e45e988f63e0fe Mon Sep 17 00:00:00 2001 From: Firestar99 Date: Fri, 27 Jun 2025 14:40:54 +0200 Subject: [PATCH] Run CI for non master branches (#2763) * ci: run CI on PRs not targeting master * fix warnings when compiling tests --- .github/workflows/build-dev-and-ci.yml | 2 -- .github/workflows/comment-clippy-warnings.yaml | 1 - .github/workflows/comment-profiling-changes.yaml | 1 - .github/workflows/library-rawkit.yml | 2 -- .github/workflows/website.yml | 2 -- editor/src/node_graph_executor/runtime.rs | 5 +++-- 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-dev-and-ci.yml b/.github/workflows/build-dev-and-ci.yml index 77fd22d2a..ff3f25151 100644 --- a/.github/workflows/build-dev-and-ci.yml +++ b/.github/workflows/build-dev-and-ci.yml @@ -5,8 +5,6 @@ on: branches: - master pull_request: - branches: - - master env: CARGO_TERM_COLOR: always INDEX_HTML_HEAD_REPLACEMENT: diff --git a/.github/workflows/comment-clippy-warnings.yaml b/.github/workflows/comment-clippy-warnings.yaml index 07acaaea2..1c02e88f0 100644 --- a/.github/workflows/comment-clippy-warnings.yaml +++ b/.github/workflows/comment-clippy-warnings.yaml @@ -2,7 +2,6 @@ name: Clippy Check on: pull_request: - branches: [master] types: [opened, reopened, synchronize, ready_for_review] jobs: diff --git a/.github/workflows/comment-profiling-changes.yaml b/.github/workflows/comment-profiling-changes.yaml index d130fdc55..d83e6d67e 100644 --- a/.github/workflows/comment-profiling-changes.yaml +++ b/.github/workflows/comment-profiling-changes.yaml @@ -2,7 +2,6 @@ name: Profiling Changes on: pull_request: - branches: [master] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/library-rawkit.yml b/.github/workflows/library-rawkit.yml index 3d286c9a9..b7b4bb315 100644 --- a/.github/workflows/library-rawkit.yml +++ b/.github/workflows/library-rawkit.yml @@ -7,8 +7,6 @@ on: paths: - "libraries/rawkit/**" pull_request: - branches: - - master paths: - "libraries/rawkit/**" diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index c137b5799..0451d4226 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -7,8 +7,6 @@ on: paths: - website/** pull_request: - branches: - - master paths: - website/** env: diff --git a/editor/src/node_graph_executor/runtime.rs b/editor/src/node_graph_executor/runtime.rs index c949e32dd..40ca633f0 100644 --- a/editor/src/node_graph_executor/runtime.rs +++ b/editor/src/node_graph_executor/runtime.rs @@ -227,8 +227,9 @@ impl NodeRuntime { } async fn update_network(&mut self, mut graph: NodeNetwork) -> Result { - #[cfg(not(test))] - preprocessor::expand_network(&mut graph, &self.substitutions); + if cfg!(not(test)) { + preprocessor::expand_network(&mut graph, &self.substitutions); + } let scoped_network = wrap_network_in_scope(graph, self.editor_api.clone());