From 3d9734de2d5a38666877156d277ad42bb37f48b4 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Fri, 5 Apr 2024 10:02:32 -0700 Subject: [PATCH] w6 --- .github/workflows/ci_windows.yml | 10 +++++++--- pixi.toml | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_windows.yml b/.github/workflows/ci_windows.yml index 88b64df1bfb64..1531428a1f30f 100644 --- a/.github/workflows/ci_windows.yml +++ b/.github/workflows/ci_windows.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: toolset: [""] - build_type: [Debug, Release] + build_type: [Release, Debug] build_shared_libs: [OFF] # TODO(JS): Add ON once shared lib build is resolved steps: @@ -93,8 +93,12 @@ jobs: || exit /b build_on_pixi: - name: win-pixi + name: win-pixi-${{ matrix.build_type }} runs-on: windows-latest + strategy: + fail-fast: false + matrix: + build_type: ["", "-dev"] steps: - name: Checkout uses: actions/checkout@v4 @@ -109,4 +113,4 @@ jobs: - name: Test DART and dartpy run: | - pixi run test # TODO: Change to test-all + pixi run test${{ matrix.build_type }} # TODO: Change to test-all diff --git a/pixi.toml b/pixi.toml index 9467815b90da7..6ad031c37c5b8 100644 --- a/pixi.toml +++ b/pixi.toml @@ -64,6 +64,9 @@ build-dev = { cmd = "cmake --build build -j --target all", depends_on = [ build-tests = { cmd = "cmake --build build -j --target tests", depends_on = [ "configure", ] } +build-tests-dev = { cmd = "cmake --build build -j --target tests", depends_on = [ + "configure-dev", +] } build-dartpy = { cmd = "cmake --build build -j --target dartpy", depends_on = [ "configure", ] } @@ -71,6 +74,9 @@ build-dartpy = { cmd = "cmake --build build -j --target dartpy", depends_on = [ test = { cmd = "ctest --test-dir build --output-on-failure", depends_on = [ "build-tests", ] } +test-dev = { cmd = "ctest --test-dir build --output-on-failure", depends_on = [ + "build-tests-dev", +] } test-dartpy = { cmd = "cmake --build build -j --target pytest", depends_on = [ "configure", ] } @@ -161,12 +167,18 @@ build-dev = { cmd = "cmake --build build --config Debug -j", depends_on = [ build-tests = { cmd = "cmake --build build --config Release -j --target tests", depends_on = [ "configure", ] } +build-tests-dev = { cmd = "cmake --build build --config Debug -j --target tests", depends_on = [ + "configure", +] } build-dartpy = { cmd = "cmake --build build -j --target dartpy", depends_on = [ "configure", ] } test = { cmd = "ctest --test-dir build --build-config Release --output-on-failure", depends_on = [ "build-tests", ] } +test-dev = { cmd = "ctest --test-dir build --build-config Debug --output-on-failure", depends_on = [ + "build-tests-dev", +] } test-dartpy = { cmd = "cmake --build build --config Release -j --target pytest", depends_on = [ "configure", ] }