From ed2d70701d3da08a08ec476052dc2791f4fb7922 Mon Sep 17 00:00:00 2001 From: William Dawson Date: Thu, 20 Jun 2024 00:34:52 +0900 Subject: [PATCH 1/3] miniconda helper update --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4dff17b3..e1474c29 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -73,7 +73,9 @@ jobs: runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v1 - - uses: conda-incubator/setup-miniconda@v2 + - uses: conda-incubator/setup-miniconda@v3 + with: + auto-activate-base: true - name: setup environment run: bash -l UnitTests/before_install.sh env: From a17f7b7eb094b8fc6e4d89cd1779e7cae00e8947 Mon Sep 17 00:00:00 2001 From: William Dawson Date: Thu, 20 Jun 2024 00:45:34 +0900 Subject: [PATCH 2/3] Pure cmake version --- UnitTests/run_cmake.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitTests/run_cmake.sh b/UnitTests/run_cmake.sh index 5c324b2e..71fa50d2 100644 --- a/UnitTests/run_cmake.sh +++ b/UnitTests/run_cmake.sh @@ -7,7 +7,7 @@ fi cd Build if [[ "$TESTOS" == "OSX" ]]; then - cmake -G Ninja .. -DCMAKE_TOOLCHAIN_FILE=../Targets/Mac-python3.cmake \ + cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release ; else if [[ "${NOIALLGATHER:-0}" -eq 1 ]]; then From 3903f1534d42347dabe738679db7390af5f98ed1 Mon Sep 17 00:00:00 2001 From: William Dawson Date: Thu, 20 Jun 2024 08:53:05 +0900 Subject: [PATCH 3/3] fix typo --- UnitTests/run_cmake.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/UnitTests/run_cmake.sh b/UnitTests/run_cmake.sh index 71fa50d2..81fdbe3e 100644 --- a/UnitTests/run_cmake.sh +++ b/UnitTests/run_cmake.sh @@ -7,8 +7,7 @@ fi cd Build if [[ "$TESTOS" == "OSX" ]]; then - cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=Release ; + cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Release ; else if [[ "${NOIALLGATHER:-0}" -eq 1 ]]; then cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Debug -DNOIALLGATHER=YES;