diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml index 6eb1c20b43e0563fbb011ba83213411e4a1dd4d5..b1bdaf61979452a73380226ce1935b43eb05c32b 100644 --- a/.github/workflows/deploy_collab.yml +++ b/.github/workflows/deploy_collab.yml @@ -27,6 +27,12 @@ jobs: with: cache: rust path: ~/.rustup + - name: steps::setup_linux + run: ./script/linux + - name: steps::install_mold + run: ./script/install-mold + - name: steps::download_wasi_sdk + run: ./script/download-wasi-sdk - name: steps::cargo_fmt run: cargo fmt --all -- --check - name: steps::clippy @@ -51,6 +57,12 @@ jobs: with: cache: rust path: ~/.rustup + - name: steps::setup_linux + run: ./script/linux + - name: steps::install_mold + run: ./script/install-mold + - name: steps::download_wasi_sdk + run: ./script/download-wasi-sdk - name: steps::cargo_install_nextest uses: taiki-e/install-action@nextest - name: steps::clear_target_dir_if_large diff --git a/tooling/xtask/src/tasks/workflows/deploy_collab.rs b/tooling/xtask/src/tasks/workflows/deploy_collab.rs index 5c18da45e58f48ca281f800533a1b6b27f1433e7..17d48d93fca8f18637b48b544c5bd39ab3c5ff06 100644 --- a/tooling/xtask/src/tasks/workflows/deploy_collab.rs +++ b/tooling/xtask/src/tasks/workflows/deploy_collab.rs @@ -1,11 +1,11 @@ use gh_workflow::{Container, Event, Port, Push, Run, Step, Use, Workflow}; use indoc::{formatdoc, indoc}; -use crate::tasks::workflows::{ - runners::{self, Platform}, - steps::{self, CommonJobConditions, NamedJob, dependant_job, named}, - vars, +use crate::tasks::workflows::runners::{self, Platform}; +use crate::tasks::workflows::steps::{ + self, CommonJobConditions, FluentBuilder as _, NamedJob, dependant_job, named, }; +use crate::tasks::workflows::vars; pub(crate) fn deploy_collab() -> Workflow { let style = style(); @@ -31,6 +31,7 @@ fn style() -> NamedJob { .add_step(steps::checkout_repo().add_with(("fetch-depth", 0))) .add_step(steps::setup_cargo_config(Platform::Linux)) .add_step(steps::cache_rust_dependencies_namespace()) + .map(steps::install_linux_dependencies) .add_step(steps::cargo_fmt()) .add_step(steps::clippy(Platform::Linux)), ) @@ -60,6 +61,7 @@ fn tests(deps: &[&NamedJob]) -> NamedJob { .add_step(steps::checkout_repo().add_with(("fetch-depth", 0))) .add_step(steps::setup_cargo_config(Platform::Linux)) .add_step(steps::cache_rust_dependencies_namespace()) + .map(steps::install_linux_dependencies) .add_step(steps::cargo_install_nextest()) .add_step(steps::clear_target_dir_if_large(Platform::Linux)) .add_step(run_collab_tests()),