Unverified Commit a11b9943 authored by Dannon's avatar Dannon Committed by GitHub
Browse files

Merge pull request #10933 from mvdbeek/osx_fix

[20.05] Fix OSX tests
parents 5f681b4f a3b75441
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ jobs:
  test:
    name: Startup test
    runs-on: macos-latest
    defaults:
      run:
        shell: bash -l {0}
    steps:
    - uses: actions/checkout@v2
      with:
@@ -16,13 +19,12 @@ jobs:
        path: ~/Library/Caches/pip
        # scripts/common_startup.sh creates a conda env for Galaxy containing Python 3.6
        key: pip-cache-3.6-${{ hashFiles('galaxy root/requirements.txt') }}
    - name: Install tox
      run: pip install tox
    - name: Install and activate miniconda  # use this job to test using Python from a conda environment
      uses: conda-incubator/setup-miniconda@v2
      with:
        activate-environment: ''
    - name: Install tox
      run: pip install tox
    - name: run tests
      run: tox -e first_startup
      shell: bash -l {0}  # need this to have CONDA_EXE set
      working-directory: 'galaxy root'