From 9db9c0a13c757d47b8a9079654ea18eb7bca3f21 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Wed, 2 Nov 2022 11:46:43 +0100 Subject: [PATCH 1/4] patch windows lld-link error Signed-off-by: Anton-4 <17049058+Anton-4@users.noreply.github.com> --- .github/workflows/windows.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 33cee2a8c5..5990d63558 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,6 +15,7 @@ jobs: runs-on: windows-2022 env: LLVM_SYS_130_PREFIX: C:\LLVM-13.0.1-win64 + WORKING_CARGO_TESTS: -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker -p roc_fmt -- --skip test_fmt::test_fmt_builtins --skip test_fmt::test_fmt_examples timeout-minutes: 150 steps: - uses: actions/checkout@v2 @@ -40,9 +41,12 @@ 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. Twice for zig error. + - name: Build tests --release without running. Twice for zig lld-link error. run: cargo test --locked --release --no-run || cargo test --locked --release --no-run - - run: cargo test --release -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker + # Why are these tests not build with previous command? => fingerprint error. Use `CARGO_LOG=cargo::core::compiler::fingerprint=info` to investigate + - name: Build specific tests without running. Twice for zig lld-link error. + run: cargo test --locked --release --no-run $env:WORKING_CARGO_TESTS || cargo test --locked --release --no-run $env:WORKING_CARGO_TESTS - - run: cargo test --release -p roc_fmt -- --skip test_fmt::test_fmt_builtins --skip test_fmt::test_fmt_examples + - name: Actually run the tests. + run: cargo test --locked --release $env:WORKING_CARGO_TESTS From cd04f3d12d7843e0310bda0644f00c7038a50f10 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Wed, 2 Nov 2022 13:19:31 +0100 Subject: [PATCH 2/4] remove roc_fmt tests Because of github error: ``` error: cannot parse ':test_fmt_builtins --skip test_fmt::test_fmt_examples' as a semver ``` Signed-off-by: Anton-4 <17049058+Anton-4@users.noreply.github.com> --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5990d63558..9916b848a7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-2022 env: LLVM_SYS_130_PREFIX: C:\LLVM-13.0.1-win64 - WORKING_CARGO_TESTS: -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker -p roc_fmt -- --skip test_fmt::test_fmt_builtins --skip test_fmt::test_fmt_examples + WORKING_CARGO_TESTS: -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker timeout-minutes: 150 steps: - uses: actions/checkout@v2 From 731b706e6a629567ca374671ef9e8273842daf72 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Wed, 2 Nov 2022 14:36:04 +0100 Subject: [PATCH 3/4] added quotes around env var Signed-off-by: Anton-4 <17049058+Anton-4@users.noreply.github.com> --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9916b848a7..679ead24dd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-2022 env: LLVM_SYS_130_PREFIX: C:\LLVM-13.0.1-win64 - WORKING_CARGO_TESTS: -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker + WORKING_CARGO_TESTS: '-p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker' timeout-minutes: 150 steps: - uses: actions/checkout@v2 From eb204f0305c1dae8167b15236a0cadc1566f3c31 Mon Sep 17 00:00:00 2001 From: Anton-4 <17049058+Anton-4@users.noreply.github.com> Date: Wed, 2 Nov 2022 16:04:53 +0100 Subject: [PATCH 4/4] ditch env var --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 679ead24dd..83a95ca0a9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,7 +15,7 @@ jobs: runs-on: windows-2022 env: LLVM_SYS_130_PREFIX: C:\LLVM-13.0.1-win64 - WORKING_CARGO_TESTS: '-p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker' + timeout-minutes: 150 steps: - uses: actions/checkout@v2 @@ -46,7 +46,7 @@ jobs: # Why are these tests not build with previous command? => fingerprint error. Use `CARGO_LOG=cargo::core::compiler::fingerprint=info` to investigate - name: Build specific tests without running. Twice for zig lld-link error. - run: cargo test --locked --release --no-run $env:WORKING_CARGO_TESTS || cargo test --locked --release --no-run $env:WORKING_CARGO_TESTS + run: cargo test --locked --release --no-run -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker || cargo test --locked --release --no-run -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker - name: Actually run the tests. - run: cargo test --locked --release $env:WORKING_CARGO_TESTS + run: cargo test --locked --release -p roc_ident -p roc_region -p roc_collections -p roc_can -p roc_types -p roc_solve -p roc_mono -p roc_gen_dev -p roc_gen_wasm -p roc_serialize -p roc_editor -p roc_linker