From 8c2804acecc94208e6b7af8053d758de743a6ec1 Mon Sep 17 00:00:00 2001 From: finlayclark Date: Tue, 17 Sep 2024 15:24:53 +0100 Subject: [PATCH] Attempt 4 to get CI working on Mac --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2e8483d..8ff7b57 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,8 @@ PACKAGE_NAME := red PACKAGE_DIR := red -# Required to get things working on MacOS GitHub CI -SHELL_SETUP = source ~/.bashrc && source ~/.bash_profile - -# If we're running in GitHub Actions, we need to use micromamba instead of conda and activate the environment -CONDA_ENV_RUN = $(if $(GITHUB_ACTIONS),$(SHELL_SETUP) && micromamba run -n $(PACKAGE_NAME),conda run --no-capture-output --name $(PACKAGE_NAME)) +# If we're running in GitHub Actions, we need to use micromamba instead of conda +CONDA_ENV_RUN = $(if $(GITHUB_ACTIONS),bash -l -c 'micromamba run -n $(PACKAGE_NAME)',conda run --no-capture-output --name $(PACKAGE_NAME)) TEST_ARGS := -v --cov=$(PACKAGE_NAME) --cov-report=term --cov-report=xml --junitxml=unit.xml --color=yes