From 819e3cbeee5fe0107e54d5d08e3acce433b6aa9d Mon Sep 17 00:00:00 2001 From: Manuel Barkhau Date: Thu, 27 Aug 2020 13:31:40 +0000 Subject: [PATCH] attempt to fix ci on macos --- .github/workflows/ci.yml | 12 +++--------- test/test_cli.py | 1 + 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82975c9..5cdfcfa 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,15 +47,6 @@ jobs: steps: - uses: actions/checkout@v2 - - name: brew install mercurial - run: brew install mercurial - - - name: debug hg - run: which hg - - - name: debug mercurial - run: which mercurial - - name: Cache Conda Envs uses: actions/cache@v2 with: @@ -66,6 +57,9 @@ jobs: restore-keys: | ${{ runner.OS }}-conda-cache-${{ hashFiles('requirements/*.txt', 'setup.py', 'makefile*') }} + - name: brew install mercurial + run: brew install mercurial + - name: make conda run: if [[ -e build/envs.txt ]]; then touch build/envs.txt; fi; diff --git a/test/test_cli.py b/test/test_cli.py index a54ebd3..810fed8 100644 --- a/test/test_cli.py +++ b/test/test_cli.py @@ -36,6 +36,7 @@ ENV = { 'GIT_AUTHOR_EMAIL' : "pycalver_tester@nowhere.com", 'GIT_COMMITTER_EMAIL': "pycalver_tester@nowhere.com", 'HGUSER' : "pycalver_tester", + 'PATH' : os.environ['PATH'], }