Skip to content

Commit

Permalink
Merge branch 'master' into AC-kubernetes
Browse files Browse the repository at this point in the history
  • Loading branch information
Acribbs committed Nov 10, 2024
2 parents 8f33f53 + b2d768e commit b83fb7f
Show file tree
Hide file tree
Showing 6 changed files with 418 additions and 226 deletions.
16 changes: 12 additions & 4 deletions .github/workflows/cgatcore_python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,25 @@ jobs:
CACHE_NUMBER: 0
with:
path: ~/conda_pkgs_dir
key:
${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{
hashFiles('conda/environments/cgat-core.yml') }}
key: ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('conda/environments/cgat-core.yml') }}
- name: Set installer URL
id: set-installer-url
run: |
if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]; then
echo "installer-url=https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh" >> $GITHUB_ENV
elif [[ "${{ matrix.os }}" == "macos-latest" ]]; then
echo "installer-url=https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-MacOSX-arm64.sh" >> $GITHUB_ENV
fi
- uses: conda-incubator/setup-miniconda@v2
with:
installer-url: ${{ env.installer-url }}
python-version: ${{ matrix.python-version }}
channels: conda-forge, bioconda, defaults
channel-priority: true
activate-environment: cgat-core
environment-file: conda/environments/cgat-core.yml
miniforge-variant: Mambaforge
- name: Configure Conda Paths
run: echo "/usr/share/miniconda3/condabin" >> $GITHUB_PATH
- name: Show conda
run: |
conda info
Expand Down
1 change: 1 addition & 0 deletions all-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ pytest -v tests/test_pipeline_control.py
pytest -v tests/test_pipeline_execution.py
pytest -v tests/test_pipeline_cli.py
pytest -v tests/test_pipeline_actions.py
pytest -v tests/test_execution_cleanup.py
Loading

0 comments on commit b83fb7f

Please sign in to comment.