Test 23

atharva-2001 · Jan 21, 2025 · 16efddc · 16efddc
1 parent 21214fc
commit 16efddc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 14 deletions.
diff --git a/.github/actions/setup_env/action.yml b/.github/actions/setup_env/action.yml
@@ -10,6 +10,18 @@ inputs:
 runs:
   using: "composite"
   steps:
+      - name: Download Lock File
+        run:  wget -q https://raw.githubusercontent.com/tardis-sn/tardis/master/conda-${{ inputs.os-label }}.lock
+        if: matrix.pip == true
+        shell: bash
+
+      - name: Generate Cache Key
+        run: | 
+          file_hash=$(cat conda-${{ inputs.os-label }}.lock | shasum -a 256 | cut -d' ' -f1)
+          echo "file_hash=$file_hash" >> "${GITHUB_OUTPUT}"
+        id: cache-environment-key
+        shell: bash
+
       - uses: mamba-org/setup-micromamba@v2
         with:
           init-shell: bash
@@ -22,13 +34,3 @@ runs:
           conda-lock install --prefix micromamba_tardis conda-${{ inputs.os-label }}.lock
           micromamba activate ./micromamba_tardis
         shell: bash -el {0}
-
-      - name: test
-        run: |
-          micromamba activate ./micromamba_tardis
-          pytest
-        shell: bash -el {0}
-        continue-on-error: true
-
-
-
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -108,14 +108,19 @@ jobs:
           mkdir -p ~/Downloads/tardis-data && cp -a ./tardis-regression-data/atom_data/. ~/Downloads/tardis-data
 
       - name: Install package
-        run: pip install -e .
+        run: |
+          micromamba activate ./micromamba_tardis
+          pip install -e .
 
       - name: Install Sphinx extensions
         run: |
+          micromamba activate ./micromamba_tardis
           pip install sphinxcontrib-googleanalytics
 
       - name: Build documentation
-        run: cd docs/ && make html NCORES=auto
+        run: |
+          micromamba activate ./micromamba_tardis
+          cd docs/ && make html NCORES=auto
 
       - name: Set destination directory
         run: |

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -69,23 +69,30 @@ jobs:
       - name: Install package editable
         if: ${{ !inputs.pip_git }}
         run: |
+          micromamba activate ./micromamba_tardis
           pip install -e . --user
 
       - name: Install package git
         if: ${{ inputs.pip_git }}
         run: |
+          micromamba activate ./micromamba_tardis
           pip install git+https://github.com/tardis-sn/tardis.git@master
 
       - name: Install qgridnext
         if: ${{ !inputs.pip_git }}
         run: |
+          micromamba activate ./micromamba_tardis
           pip install qgridnext
 
       - name: Run tests
-        run: pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum"
+        run: |
+          micromamba activate ./micromamba_tardis
+          pytest tardis ${{ env.PYTEST_FLAGS }} -m "${{ matrix.continuum }} continuum"
 
       - name: Regression Data Generation tests
-        run: pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum"
+        run: |
+          micromamba activate ./micromamba_tardis
+          pytest tardis ${{ env.PYTEST_FLAGS }} --generate-reference -m "${{ matrix.continuum }} continuum"
         if: contains(github.event.pull_request.labels.*.name, 'run-generation-tests') || github.ref == 'refs/heads/master'
 
       - run: mv .coverage .coverage.${{ strategy.job-index }}