trying to fix test runs in CI

Signed-off-by: Nick Papior <[email protected]>
zerothi · Aug 6, 2024 · b247078 · b247078
1 parent 9f8b8ef
commit b247078
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/documentation_ghpages.yaml b/.github/workflows/documentation_ghpages.yaml
@@ -49,12 +49,11 @@ jobs:
           lfs: true
           fetch-tags: true
 
-
-      # This should generally not be required, but in the end it is just easier
-      - name: Ensure system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install gfortran
+      - name: Ensure fortran
+        uses: fortran-lang/setup-fortran@v1
+        with:
+          compiler: gcc
+          version: 11
 
       - name: Setup python environment
         uses: actions/setup-python@v5

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -99,11 +99,27 @@ jobs:
         version: 11
 
     - name: Print-out commit information
+      id: info
       run: |
         echo "branch: ${{ github.event.inputs.branch }}"
         echo "hash: ${{ github.sha }}"
         echo "python-version: ${{ matrix.python-version }}"
 
+        # Put stuff in the environment
+        #
+        # Test everything including LSF files submodule?
+        if [[ "${{ matrix.full-test }}" == "true" ]]; then
+          echo "sisl_extras=test,viz" >> $GITHUB_OUTPUT
+        else
+          echo "sisl_extras=test" >> $GITHUB_OUTPUT
+        fi
+        # Test minimal versioning?
+        if [[ "${{ matrix.minimal-dep }}" == "true" ]]; then
+          echo "sisl_install_packages=\"'numpy==1.21.*' 'scipy==1.6.*' 'xarray==0.21.*'\"" >> $GITHUB_OUTPUT
+        else
+          echo "sisl_install_packages=''" >> $GITHUB_OUTPUT
+        fi
+
     - name: Python installation
       uses: actions/setup-python@v5
       with:
@@ -116,31 +132,27 @@ jobs:
     - name: Python minimal versions
       if: ${{ matrix.minimal-dep }}
       run: |
-        python -m pip install --progress-bar=off -v \
-        "numpy==1.21.*" "scipy==1.6.*" "xarray==0.21.*"
+        python -m pip install --progress-bar=off -v ${{ steps.info.outputs.sisl_install_packages }}
 
     - name: Install sisl + dependencies
       env:
         SKBUILD_CMAKE_ARGS: -DWITH_COVERAGE:bool=true;-DWITH_LINE_DIRECTIVES:bool=true
         CC: gcc
         FC: gfortran
       run: |
-        if [[ "${{ matrix.full-test }}" == "true" ]]; then
-          python -m pip install --progress-bar=off -vv .[test,viz]
-        else
-          python -m pip install --progress-bar=off -vv .[test]
-        fi
+        python -m pip install --progress-bar=off -v .[${{ steps.info.outputs.sisl_extras }}] \
+          ${{ steps.info.outputs.sisl_install_packages }}
 
     - name: sisl debug info
       run: |
         python -c 'from sisl._debug_info import * ; print_debug_info()'
 
-    - name: Running sisl import test
+    - name: sisl import test
       run: |
         sgeom --help
         stoolbox atom-plot --help
 
-    - name: Running sisl tests
+    - name: sisl tests
       env:
         SISL_NUM_PROCS: 1
         OMP_NUM_THREADS: 1