ci: use setup-fortran, use major version tags for actions

modflowpy · Oct 13, 2023 · 8a94302 · 8a94302
1 parent 5fa9257
commit 8a94302
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 30 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,25 +27,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Intel Fortran Classic
-        uses: awvwgk/setup-fortran@main
+        uses: awvwgk/setup-fortran@v1
         with:
           compiler: intel-classic
-          version: 2021.7.0
-
-      - name: Set SETVARS_COMPLETED (temporary)
-        run: echo "SETVARS_COMPLETED=1" >> $GITHUB_ENV
-
-      - name: Set CXX (temporary)
-        if: runner.os == 'Windows'
-        run: |
-          echo "CXX=icl" >> $GITHUB_ENV
+          version: "2021.7"
 
       - name: Setup Graphviz
         if: runner.os == 'Linux'
         uses: ts-graphviz/setup-graphviz@v1
 
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -83,6 +75,6 @@ jobs:
           coverage report
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v3
         with:
           file: ./autotest/coverage.xml
diff --git a/.github/workflows/pymake-gcc.yml b/.github/workflows/pymake-gcc.yml
@@ -31,7 +31,7 @@ jobs:
         uses: ts-graphviz/setup-graphviz@v1
 
       - name: Setup Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -41,7 +41,7 @@ jobs:
           pip install ".[test]"
 
       - name: Setup GNU Fortran
-        uses: awvwgk/setup-fortran@main
+        uses: awvwgk/setup-fortran@v1
         with:
           compiler: gcc
           version: 11
@@ -66,7 +66,7 @@ jobs:
           coverage report
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v3
         with:
           file: ./autotest/coverage.xml
 
@@ -89,7 +89,7 @@ jobs:
         uses: ts-graphviz/setup-graphviz@v1
 
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -98,11 +98,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install ".[test]"
 
-      - name: Setup symbolic link to gfortran on Linux
-        run: |
-          sudo ln -fs /usr/bin/gfortran-${{ matrix.gcc-version }} /usr/local/bin/gfortran
-          sudo ln -fs /usr/bin/gcc-${{ matrix.gcc-version }} /usr/local/bin/gcc
-          sudo ln -fs /usr/bin/g++-${{ matrix.gcc-version }} /usr/local/bin/g++
+      - name: Setup GNU Fortran
+        uses: awvwgk/setup-fortran@v1
+        with:
+          compiler: gcc
+          version: ${{ matrix.gcc-version }}
 
       - name: Print GNU compiler versions
         run: |
@@ -125,7 +125,7 @@ jobs:
           coverage report
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v3
         with:
           file: ./autotest/coverage.xml
 
@@ -145,7 +145,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
 
@@ -154,8 +154,11 @@ jobs:
           python -m pip install --upgrade pip
           pip install ".[test]"
 
-      - name: Install GNU Fortran
-        uses: modflowpy/install-gfortran-action@v1
+      - name: Setup GNU Fortran
+        uses: awvwgk/setup-fortran@v1
+        with:
+          compiler: gcc
+          version: 11
 
       - name: Download examples for pytest runs
         run: |

diff --git a/.github/workflows/pymake-linting-install.yml b/.github/workflows/pymake-linting-install.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -75,7 +75,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 

diff --git a/.github/workflows/pymake-requests.yml b/.github/workflows/pymake-requests.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v4.3.0
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
 
@@ -49,6 +49,6 @@ jobs:
           coverage report
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3.1.1
+        uses: codecov/codecov-action@v3
         with:
           file: ./autotest/coverage.xml
diff --git a/.github/workflows/pymake-rtd.yml b/.github/workflows/pymake-rtd.yml
@@ -22,7 +22,7 @@ jobs:
 
       - name: Trigger RTDs build
         if: github.ref == 'refs/heads/master'
-        uses: dfm/rtds-action@v1.0.3
+        uses: dfm/rtds-action@v1
         with:
           webhook_url: ${{ secrets.RTDS_WEBHOOK_URL }}
           webhook_token: ${{ secrets.RTDS_WEBHOOK_TOKEN }}