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: diff --git a/UnitTests/run_cmake.sh b/UnitTests/run_cmake.sh index 5c324b2e..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_TOOLCHAIN_FILE=../Targets/Mac-python3.cmake \ - -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;