various fixes/updates

* add test for Powershell Desktop ('powershell') on Windows
* fix test steps to use setup step's outputs (FC & CC)
* store runner/toolchain version compatibility in CSV
* add CI to create PR updating compat.csv and README if compatibility change detected (skipped if compat.csv doesn't exist)
* fix continue-on-error CI configuration

Author: wpbonelli

.github/workflows/test.yml

@@ -4,18 +4,18 @@ on:
   push:
     branches:
       - main
-      - develop
+      - develop*
   pull_request:
     branches:
       - main
-      - develop
+      - develop*
   schedule:
-    - cron: '0 6 * * *' # run at 6 AM UTC every day
+    - cron: '0 6 * * *'
 
 jobs:
   test:
+    name: Test compiler
     runs-on: ${{ matrix.os }}
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
@@ -28,13 +28,15 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Fortran
+        continue-on-error: true
         id: setup-fortran
         uses: ./
         with:
           compiler: ${{ matrix.compiler }}
           version: ${{ matrix.version }}
 
       - name: Check compiler version
+        if: steps.setup-fortran.outcome == 'success'
         shell: bash
         env:
           FC: ${{ steps.setup-fortran.outputs.fc }}
@@ -46,26 +48,49 @@ jobs:
           echo $fcv
           echo $ccv
           
-          fcv=${fcv##* }
-          ccv=${ccv##* }
+          fcv=$(echo "${fcv##*)}" | xargs)
+          ccv=$(echo "${ccv##*)}" | xargs)
           
           [[ $fcv == ${{ matrix.version }}* ]] || (echo "unexpected Fortran compiler version: $fcv"; exit 1)
           [[ $ccv == ${{ matrix.version }}* ]] || (echo "unexpected C compiler version: $ccv"; exit 1)
 
       - name: Test compile program (bash)
-        continue-on-error: true
+        if: steps.setup-fortran.outcome == 'success'
         shell: bash
+        env:
+          FC: ${{ steps.setup-fortran.outputs.fc }}
+          CC: ${{ steps.setup-fortran.outputs.cc }}
         run: |
-          gfortran -o hw test/hw.f90
+          ${{ env.FC }} -o hw hw.f90
           output=$(./hw '2>&1')
           [[ "$output" == *"hello world"* ]] && echo "$output" || (echo "Unexpected output: $output"; exit 1)
 
-      - name: Test compile program (pwsh)
-        if: runner.os == 'Windows'
+      - name: Test compile program (Powershell Core)
+        if: steps.setup-fortran.outcome == 'success' && runner.os == 'Windows'
         shell: pwsh
+        env:
+          FC: ${{ steps.setup-fortran.outputs.fc }}
+          CC: ${{ steps.setup-fortran.outputs.cc }}
+        run: |
+          rm hw.exe
+          ${{ env.FC }} -o hw.exe hw.f90 
+          $output=$(& ".\hw.exe")
+          if ($output -match "hello world") {
+              write-output $output
+          } else {
+              write-output "unexpected output: $output"
+              exit 1
+          }
+      
+      - name: Test compile program (Powershell Desktop)
+        if: steps.setup-fortran.outcome == 'success' && runner.os == 'Windows'
+        shell: powershell
+        env:
+          FC: ${{ steps.setup-fortran.outputs.fc }}
+          CC: ${{ steps.setup-fortran.outputs.cc }}
         run: |
           rm hw.exe
-          gfortran -o hw.exe test\hw.f90 
+          ${{ env.FC }} -o hw.exe hw.f90 
           $output=$(& ".\hw.exe")
           if ($output -match "hello world") {
               write-output $output
@@ -75,15 +100,141 @@ jobs:
           }
 
       - name: Test compile program (cmd)
-        if: runner.os == 'Windows'
+        if: steps.setup-fortran.outcome == 'success' && runner.os == 'Windows'
         shell: cmd
+        env:
+          FC: ${{ steps.setup-fortran.outputs.fc }}
+          CC: ${{ steps.setup-fortran.outputs.cc }}
         run: |
           del hw.exe
-          gfortran -o hw.exe test\hw.f90 
+          ${{ env.FC }} -o hw.exe hw.f90 
           for /f "tokens=* usebackq" %%f in (`.\hw.exe`) do @set "OUTPUT=%%f"
           if "%OUTPUT%"=="hello world" (
-            exit 0
+            echo %OUTPUT%
           ) else (
-            echo "unexpected output: %OUTPUT%"
+            echo unexpected output: %OUTPUT%
             exit 1
           )
+
+      - name: Create compatibility report
+        shell: bash
+        run: |
+          if [[ "${{ steps.setup-fortran.outcome }}" == "success" ]]; then
+            support="✓"
+          else
+            support=""
+          fi
+          
+          mkdir compat
+          prefix="${{ matrix.os }},${{ matrix.compiler }},${{ matrix.version }}"
+          echo "$prefix,$support" >> "compat/${prefix//,/_}.csv"
+
+      - name: Upload compatibility report
+        uses: actions/upload-artifact@v3
+        with:
+          name: compat
+          path: compat/*.csv
+
+  compat:
+    name: Report compatibility
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Install packages
+        run: |
+          pip install tabulate pandas
+
+      - name: Download reports
+        uses: actions/download-artifact@v3
+        with:
+          name: compat
+          path: compat
+
+      - name: Concatenate reports
+        run: |
+          echo "runner,compiler,version,support" > compat_long.csv
+          cat compat/*.csv >> compat_long.csv
+
+      - name: Make wide CSV and MD table
+        id: merge-reports
+        shell: python
+        run: |
+          import pandas as pd
+          df = pd.read_csv("compat_long.csv")
+          df = pd.pivot(df, index="runner", columns="version", values="support")
+          df = df.sort_values(by=["runner"])
+          df.to_csv("compat.csv")
+          with open("compat.md", "w") as file:
+            file.write(df.to_markdown().replace("nan", ""))
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: compat
+          path: |
+            compat.csv
+            compat.md
+
+      - name: Check for changes
+        id: diff
+        run: |
+          if ! [ -f compat.csv ]; then
+            echo "diff=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          diff=$(git diff compat.csv)
+          if [[ $diff == "" ]]; then
+            echo "No changes found"
+            echo "diff=false" >> $GITHUB_OUTPUT
+          else
+            echo "Changes found:"
+            echo "$diff"
+            echo "diff=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Update README
+        if: steps.diff.outputs.diff == 'true'
+        shell: python
+        run: |
+          import re
+          from pathlib import Path
+          readme_path = Path("README.md")
+          readme = readme_path.open().read()
+          with open("compat.md", "r") as compat:
+            table = ''.join(compat.readlines())
+            r = re.compile(r'<!\-\- compat starts \-\->.*<!\-\- compat ends \-\->', re.DOTALL)
+            chunk = '<!-- compat starts -->{}<!-- compat ends -->'.format('\n{}\n'.format(table))
+            readme_path.open('w').write(r.sub(chunk, readme))
+
+      - name: Print README diff
+        if: steps.diff.outputs.diff == 'true'
+        run: |
+          git diff README.md
+
+      - name: Create pull request
+        if: steps.diff.outputs.diff == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          
+          now=$(date +'%Y-%m-%dT%H-%M-%S')
+          updated_branch="compat_$now"
+          default_branch="${{ github.event.repository.default_branch }}"
+          
+          git switch -c "$updated_branch"
+          git add compat.csv README.md
+          git commit -m "Update compatibility matrix"
+          git push -u origin "$updated_branch"
+          gh pr create -B "$default_branch" -H "$updated_branch" --title "Update compatibility matrix" --body-file compat.md

README.md

@@ -33,11 +33,13 @@ jobs:
 
 ## Options
 
-- *compiler*: Compiler toolchain to setup,
-  available options are *gcc*.
+- *compiler*: Compiler toolchain to setup, available options are *gcc*
+- *version*: Version of the compiler toolchain, available options for *gcc* are *5-12*
 
-- *version*: Version of the compiler toolchain,
-  available options for *gcc* are:
+
+## Runner compatibility
+
+<!-- compat starts -->
 
 |                               | 5       | 6       | 7       | 8       | 9       | 10      | 11      | 12      |
 |-------------------------------|---------|---------|---------|---------|---------|---------|---------|---------|
@@ -50,6 +52,8 @@ jobs:
 | windows-2022 (windows-latest) |         |         |         | &check; | &check; | &check; | &check; | &check; |
 | windows-2019                  |         |         |         | &check; | &check; | &check; | &check; | &check; |
 
+<!-- compat ends -->
+
 
 ## License
 

action.yml

@@ -31,12 +31,9 @@ runs:
         compiler=${COMPILER:-gcc}
         platform=$(uname -s)
 
-        echo "detected C compiler $compiler"
-        echo "detected platform $platform"
-
         case $compiler in
           gcc)
-            version=${VERSION:-9}
+            version=${VERSION:-11}
             ;;
           *)
             exit 1
@@ -63,16 +60,11 @@ runs:
 
         which "${FC}"
         which "${CC}"
-
+  
+        # set outputs
         echo "fc=${FC}" >> $GITHUB_OUTPUT
         echo "cc=${CC}" >> $GITHUB_OUTPUT
-
-    - name: Link mingw DLL (Windows)
-      if: runner.os == 'Windows'
-      shell: bash
-      run: |
-        FCDIR=/c/ProgramData/Chocolatey/bin
-        LNDIR=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin
-        if [ -d "$FCDIR" ] && [ -f "$LNDIR/libgfortran-5.dll" ] && [ ! -f "$FCDIR/libgfortran-5.dll" ]; then
-            ln -s "$LNDIR/libgfortran-5.dll" "$FCDIR/libgfortran-5.dll"
-        fi
+        
+        # persist environment variables
+        echo "FC=${FC}" >> $GITHUB_ENV
+        echo "CC=${CC}" >> $GITHUB_ENV

compat.csv

@@ -9,6 +9,7 @@ install_gcc_brew()
   ln -fs /usr/local/bin/gcc-${version} /usr/local/bin/gcc
   ln -fs /usr/local/bin/g++-${version} /usr/local/bin/g++
 
+  # link lib dir for previous GCC versions to avoid missing .dylib issues
   for (( i=12; i>4; i-- ))
   do
     gcc_lib_path="/usr/local/opt/gcc/lib/gcc/$i"
@@ -69,6 +70,13 @@ install_gcc_choco()
   export FC="gfortran"
   export CC="gcc"
   export CXX="g++"
+
+  # missing DLL can cause successfully compiled executables to fail at runtime
+  FCDIR=/c/ProgramData/Chocolatey/bin
+  LNDIR=/c/ProgramData/Chocolatey/lib/mingw/tools/install/mingw64/bin
+  if [ -d "$FCDIR" ] && [ -f "$LNDIR/libgfortran-5.dll" ] && [ ! -f "$FCDIR/libgfortran-5.dll" ]; then
+      ln -s "$LNDIR/libgfortran-5.dll" "$FCDIR/libgfortran-5.dll"
+  fi
 }
 
 install_gcc_winlibs()
@@ -104,33 +112,17 @@ install_gcc_winlibs()
   if command -v curl > /dev/null 2>&1; then
     fetch="curl -L"
   elif command -v wget > /dev/null 2>&1; then
-    FETCH="wget -O -"
+    fetch="wget -O -"
   else
     echo "No download mechanism found. Install curl or wget first."
     exit 1
   fi
 
-  $fetch "$repo/$tag/$zip" > winlibs_mingw.zip
+  $fetch "$repo/$tag/$zip" > gcc.zip
 
-  unzip -qo winlibs_mingw.zip "mingw64/bin/*" -d /
+  unzip -qo gcc.zip "mingw64/bin/*" -d /
 
   export FC="gfortran"
   export CC="gcc"
   export CXX="g++"
-
-  default_gfc="/c/ProgramData/Chocolatey/bin/gfortran"
-  default_gcc="/c/ProgramData/Chocolatey/bin/gcc"
-  default_gcx="/c/ProgramData/Chocolatey/bin/g++"
-
-  [ -f $default_gfc ] && mv $default_gfc "$RUNNER_TEMP/gfortran"
-  [ -f $default_gcc ] && mv $default_gcc "$RUNNER_TEMP/gcc"
-  [ -f $default_gcx ] && mv $default_gcx "$RUNNER_TEMP/g++"
-
-  default_gfc="/c/Strawberry/c/bin/gfortran"
-  default_gcc="/c/Strawberry/c/bin/gcc"
-  default_gcx="/c/Strawberry/c/bin/g++"
-
-  [ -f $default_gfc ] && mv $default_gfc "$RUNNER_TEMP/gfortran"
-  [ -f $default_gcc ] && mv $default_gcc "$RUNNER_TEMP/gcc"
-  [ -f $default_gcx ] && mv $default_gcx "$RUNNER_TEMP/g++"
 }