From fda3b44315cc6894c633c1b807a41c7357563736 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Sat, 29 Oct 2022 16:57:32 +0200 Subject: [PATCH] windows flake is different than on macos --- .github/workflows/windows.yml | 6 +++--- crates/compiler/builtins/build.rs | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3d834e81c9..5cc9213175 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,9 +34,9 @@ jobs: curl.exe -L -O https://github.com/roc-lang/llvm-package-windows/releases/download/v13.0.1/LLVM-13.0.1-win64.7z 7z x LLVM-13.0.1-win64.7z -oC:\LLVM-13.0.1-win64 - - name: build tests release without running - run: cargo test --locked --release --no-run + - name: Build tests release without running. Twice for flakyness. + run: cargo test --locked --release --no-run || cargo test --locked --release --no-run - run: cargo test-gen-llvm - + - run: cargo test-gen-wasm diff --git a/crates/compiler/builtins/build.rs b/crates/compiler/builtins/build.rs index 383ce078d7..a72606780b 100644 --- a/crates/compiler/builtins/build.rs +++ b/crates/compiler/builtins/build.rs @@ -227,10 +227,9 @@ fn run_command + Copy>( Err(_) => format!("Failed to run \"{}\"", command_str), }; - // flaky test errors - if error_str.contains("FileNotFound") // only occurs sometimes inside MacOS ci run - || error_str.contains("unable to save cached ZIR code") // only occurs sometimes inside MacOS ci run - || error_str.contains("lld-link: error: failed to write the output file: Permission denied") // only occurs sometimes on windows + // Flaky test errors that only occur sometimes on MacOS ci server. + if error_str.contains("FileNotFound") + || error_str.contains("unable to save cached ZIR code") { if flaky_fail_counter == 10 { panic!("{} failed 10 times in a row. The following error is unlikely to be a flaky error: {}", command_str, error_str);