[CI] reverted up to e2c7c61 and added specific TELEMAC locks

ec-jrc · Mar 20, 2024 · fa5f560 · fa5f560
1 parent 5ad28fa
commit fa5f560
Show file tree

Hide file tree

Showing 7 changed files with 14,672 additions and 1 deletion.
diff --git a/.github/workflows/conda_pip.yml b/.github/workflows/conda_pip.yml
@@ -64,10 +64,12 @@ jobs:
       SCHISM_ENV: "SCHISM_ENV"
       DELFT3D_ENV: "DELFT3D_ENV"
       PYPOSEIDON_ENV: "PYPOSEIDON_ENV"
+      PYPOS_TEL_ENV: "PYPOS_TEL_ENV"
       #
       SCHISM_LOCK: locks/conda-${{ matrix.os }}-schism_${{ matrix.mpi }}.lock
       DELFT3D_LOCK: locks/conda-${{ matrix.os }}-delft3d_${{ matrix.mpi }}.lock
       PYPOSEIDON_LOCK: locks/conda-${{ matrix.os }}-binary-p${{ matrix.python }}.lock
+      PYPOS_TEL_LOCK: locks/conda-${{ matrix.os }}-binary-p${{ matrix.python }}_tel.lock
       REQUIREMENTS_CI: locks/requirements-ci.txt
       REQUIREMENTS_VIZ: locks/requirements-viz.txt
 
@@ -129,6 +131,16 @@ jobs:
             ${{ matrix.os }}-${{ matrix.python }}-${{ env.PYPOSEIDON_ENV }}-${{ hashFiles( env.PYPOSEIDON_LOCK )}}
             ${{ matrix.os }}-${{ matrix.python }}-${{ env.PYPOSEIDON_ENV }}-
 
+      - name: "Cache ${{ env.PYPOS_TEL_ENV }}"
+        uses: actions/cache@v3
+        id: cache-PYPOS_TEL_ENV
+        with:
+          path: ~/micromamba/envs/${{ env.PYPOS_TEL_ENV }}
+          key: ${{ matrix.os }}-${{ matrix.python }}-${{ env.PYPOS_TEL_ENV }}-${{ hashFiles( env.PYPOS_TEL_LOCK )}}-${{ hashFiles( env.REQUIREMENTS_CI )}}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.python }}-${{ env.PYPOS_TEL_ENV }}-${{ hashFiles( env.PYPOS_TEL_LOCK )}}
+            ${{ matrix.os }}-${{ matrix.python }}-${{ env.PYPOS_TEL_ENV }}-
+
       - name: Cache tests/data/
         uses: actions/cache@v3
         env:
@@ -150,6 +162,10 @@ jobs:
         if: steps.cache-PYPOSEIDON_ENV.outputs.cache-hit != 'true'
         run: micromamba create --yes --name ${PYPOSEIDON_ENV} -f ${PYPOSEIDON_LOCK}
 
+      - name: "Create ${{ env.PYPOS_TEL_ENV }}"
+        if: steps.cache-PYPOS_TEL_ENV.outputs.cache-hit != 'true'
+        run: micromamba create --yes --name ${PYPOS_TEL_ENV} -f ${PYPOS_TEL_LOCK}
+
       - name: "Install python dependencies"
         run: |
           eval "$(micromamba shell hook)"
@@ -193,5 +209,5 @@ jobs:
       - name: "Run tests: TELEMAC"
         run: |
           eval "$(micromamba shell hook)"
-          micromamba activate "${PYPOSEIDON_ENV}"
+          micromamba activate "${PYPOS_TEL_ENV}"
           make test_telemac