Skip to content

Commit

Permalink
Attempt 8 to get CI working on Mac
Browse files Browse the repository at this point in the history
  • Loading branch information
fjclark committed Sep 17, 2024
1 parent f348c6a commit 760563e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,6 @@ jobs:
python -m pip install . --no-deps
micromamba list
- name: Check formatting
shell: bash -l {0}
run: |
micromamba ruff check red
git diff --exit-code
- name: Lint
shell: bash -l {0}
run: |
Expand Down
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ PACKAGE_NAME := red
PACKAGE_DIR := red

# If we're running in GitHub Actions, we need to use micromamba instead of conda.
# Easiest way to do this is to avoid using conda run in GitHub Actions (since the environment
# is already activated). Hence, set CONDA_ENV_RUN to an empty string if we're in GitHub Actions.
CONDA_ENV_RUN = $(if $(GITHUB_ACTIONS),,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
Expand Down

0 comments on commit 760563e

Please sign in to comment.