diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 4d9d97e..63524ba 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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: @@ -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 @@ -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 @@ -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 @@ -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) \ No newline at end of file + # ./${{ env.NAME }}.conda-lock.yml \ No newline at end of file diff --git a/env-dev.yml b/env-dev.yml index b30cd13..1c240fb 100644 --- a/env-dev.yml +++ b/env-dev.yml @@ -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 \ No newline at end of file diff --git a/env.yml b/env.yml index 656b651..e90efa0 100644 --- a/env.yml +++ b/env.yml @@ -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