From 58104cac929feeda0bb3067fa26af57324701cb9 Mon Sep 17 00:00:00 2001 From: Yota Toyama Date: Sun, 11 Aug 2024 15:14:00 +1000 Subject: [PATCH] Fix build jobs (#2460) --- .github/workflows/lint.yaml | 6 ------ Dockerfile | 4 ++-- .cspell.json => cspell.json | 1 + lib/ffi/src/future/call_function.rs | 1 + lib/infra/src/ninja_build_script_runner.rs | 2 +- lib/infra/src/test_linker.rs | 2 +- 6 files changed, 6 insertions(+), 10 deletions(-) rename .cspell.json => cspell.json (98%) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index b2671219d9..f4135a7619 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -20,12 +20,6 @@ jobs: - uses: actions/checkout@v4 - uses: ./tools/ci/github/setup - run: tools/lint.sh -- -D warnings - unused_dependencies: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v4 - - uses: ./tools/ci/github/setup - - run: tools/unused_dependencies.sh spell_check: runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index 5e221be4e3..717cf5f501 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ from ubuntu:20.04 -env DEBIAN_FRONTEND=noninteractive +env DEBIAN_FRONTEND=noninteractive run apt update --fix-missing && apt install -y \ build-essential \ @@ -26,7 +26,7 @@ shell ["bash", "-lc"] run git clone https://github.com/Homebrew/brew ~/.homebrew run ~/.homebrew/bin/brew shellenv >> ~/.profile -run brew install hello +run brew info hello run curl -fsSL https://sh.rustup.rs | sh /dev/stdin -y run cargo install mdbook sccache turtle-build diff --git a/.cspell.json b/cspell.json similarity index 98% rename from .cspell.json rename to cspell.json index 7b689f27a7..a9bedab373 100644 --- a/.cspell.json +++ b/cspell.json @@ -45,6 +45,7 @@ "libc", "malloc", "metaprogramming", + "metavars", "mfmt", "mkdocs", "modifiability", diff --git a/lib/ffi/src/future/call_function.rs b/lib/ffi/src/future/call_function.rs index 28626f998d..c3038db07d 100644 --- a/lib/ffi/src/future/call_function.rs +++ b/lib/ffi/src/future/call_function.rs @@ -20,6 +20,7 @@ macro_rules! call_function { let mut initialize = Some(|stack: &mut AsyncStack| { let function = $function; + #[allow(clippy::macro_metavars_in_unsafe)] unsafe { function(stack, resolve, $($argument),*) }; }); diff --git a/lib/infra/src/ninja_build_script_runner.rs b/lib/infra/src/ninja_build_script_runner.rs index f4dd4df8b3..622dcad76a 100644 --- a/lib/infra/src/ninja_build_script_runner.rs +++ b/lib/infra/src/ninja_build_script_runner.rs @@ -43,7 +43,7 @@ impl app::infra::BuildScriptRunner for NinjaBuildScriptRunner { .arg("--quiet") .arg("-f") .arg(&build_script_file) - .arg(&self.file_path_converter.convert_to_os_path(target_file)) + .arg(self.file_path_converter.convert_to_os_path(target_file)) .stdout(Stdio::inherit()) .stderr(Stdio::inherit()), )?; diff --git a/lib/infra/src/test_linker.rs b/lib/infra/src/test_linker.rs index 3ff9c485b2..9af507325a 100644 --- a/lib/infra/src/test_linker.rs +++ b/lib/infra/src/test_linker.rs @@ -120,7 +120,7 @@ impl app::infra::TestLinker for TestLinker { command_runner::run_command( Command::new("cp") .arg("-r") - .arg(&Path::new(&language_root_directory).join("cmd/test")) + .arg(Path::new(&language_root_directory).join("cmd/test")) .arg(&main_crate_directory), )?; }