Skip to content

Commit

Permalink
Added mule from coecms conda channel
Browse files Browse the repository at this point in the history
  • Loading branch information
atteggiani committed Aug 15, 2024
1 parent 534f725 commit 3ade8d0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
paths:
- 'env.yml'
pull_request: #TODO: remove this line after testing
workflow_dispatch: #TODO: remove this line after testing

jobs:
setup-deployment-env:
Expand Down Expand Up @@ -46,8 +45,7 @@ jobs:
shell: micromamba-shell {0}
run: |
conda pack
# conda-lock lock --file env.yml --platform linux-64 --micromamba --lockfile ${{ steps.access-ram.outputs.name }}.conda-lock.yml
# TODO: Solve issue with conda-lock (https://github.com/ACCESS-NRI/access-ram-condaenv/issues/3)
conda-lock lock --file env.yml --platform linux-64 --micromamba --lockfile ${{ steps.access-ram.outputs.name }}.conda-lock.yml
- name: Upload Artifact
uses: actions/upload-artifact@v4
Expand All @@ -56,8 +54,7 @@ jobs:
if-no-files-found: error
path: |
${{ steps.access-ram.outputs.name }}.tar.gz
# ${{ steps.access-ram.outputs.name }}.conda-lock.yml
# TODO: Solve issue with conda-lock (https://github.com/ACCESS-NRI/access-ram-condaenv/issues/3)
${{ steps.access-ram.outputs.name }}.conda-lock.yml
deploy:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -106,6 +103,7 @@ jobs:
source ${{ env.ENVIRONMENT_LOCATION }}/bin/activate
conda-unpack
source ${{ env.ENVIRONMENT_LOCATION }}/bin/deactivate
rm -r ${{ vars.DEPLOYMENT_LOCATION }}/${{ env.NAME }}.tar.gz
# ln -s ${{ vars.MODULE_LOCATION }}/.common ${{ vars.MODULE_LOCATION }}/${{ env.VERSION }}
EOT
Expand All @@ -119,5 +117,4 @@ jobs:
# fail_on_unmatched_files: true
# files: |
# ./${{ env.NAME }}.tar.gz
# # ./${{ env.NAME }}.conda-lock.yml
# # TODO: Solve issue with conda-lock (https://github.com/ACCESS-NRI/access-ram-condaenv/issues/3)
# ./${{ env.NAME }}.conda-lock.yml
6 changes: 2 additions & 4 deletions env-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ channels:
dependencies:
- hypothesis
- ipykernel
- mule
- numpy=1.23.4 # https://stackoverflow.com/a/75148219/21024780
- pip
- python=3.10
- pytest
- pytest-cov
- pre_commit
- scitools-iris
- xarray
- pip:
- mule @ git+https://github.com/metomi/mule@cce4b99c7046217b1ec1192118a786636e0d8e54#subdirectory=mule
- xarray
4 changes: 1 addition & 3 deletions env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ channels:
dependencies:
- conda-lock
- conda-pack
- mule
- numpy=1.23.4 # https://stackoverflow.com/a/75148219/21024780
- pip
- python=3.10
- scitools-iris
- xarray
- pip:
- mule @ git+https://github.com/metomi/mule@cce4b99c7046217b1ec1192118a786636e0d8e54#subdirectory=mule

0 comments on commit 3ade8d0

Please sign in to comment.