From 2a3f5dfec69522e1f22e141d7b55cd0c9b6419c9 Mon Sep 17 00:00:00 2001 From: Jay Qi Date: Fri, 1 Sep 2023 21:33:07 -0400 Subject: [PATCH] Try path instead --- .github/workflows/tests.yml | 6 ++++-- tests/conda_harness.sh | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5d41072cd..ad3f931af 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,9 +78,11 @@ jobs: choco install --verbose make # Add bundled conda to PATH # echo "${CONDA}\Scripts" >> $GITHUB_PATH + # Add micromamba to PATH + echo "C:\Users\runneradmin\micromamba-bin\" >> $GITHUB_PATH # Set executable paths - echo "CONDA_EXECUTABLE=$MAMBA_EXE" >> "$GITHUB_ENV" - echo "CONDA_SHELL_HOOK=$MAMBA_EXE shell hook --shell bash" >> "$GITHUB_ENV" + echo "CONDA_EXECUTABLE=micromamba" >> "$GITHUB_ENV" + echo "CONDA_SHELL_HOOK=micromamba shell hook --shell bash" >> "$GITHUB_ENV" echo "BASH_EXECUTABLE=$(which bash)" >> "$GITHUB_ENV" - name: Install dependencies diff --git a/tests/conda_harness.sh b/tests/conda_harness.sh index 4cb070761..870232cb4 100644 --- a/tests/conda_harness.sh +++ b/tests/conda_harness.sh @@ -31,8 +31,14 @@ then sudo chown -R $USER /usr/local/miniconda fi +echo "Creating environment..." make create_environment CONDA_EXECUTABLE=$CONDA_EXECUTABLE + +echo "Activating environment..." $CONDA_EXECUTABLE activate $PROJECT_NAME + +echo "Installing requirements..." make requirements CONDA_EXECUTABLE=$CONDA_EXECUTABLE +echo "Running tests..." run_tests $PROJECT_NAME