Merge branch 'main' into custom-path-to-config

Author: perazz

.github/actions/setup-intel/action.yml

@@ -0,0 +1,116 @@
+name: 'Setup Intel oneAPI Environment'
+description: 'Sets up Intel oneAPI C++, Fortran compilers and MPI on Windows or Ubuntu runners.'
+
+inputs:
+  os:
+    description: 'Operating system of the runner. Must contain "windows" or "ubuntu".'
+    required: true
+    type: string
+
+runs:
+  using: "composite"
+  steps:
+    - name: (Windows) Setup VS Build environment
+      if: contains(inputs.os, 'windows')
+      uses: seanmiddleditch/gha-setup-vsdevenv@v4
+
+    - name: (Windows) Retrieve and Install Intel toolchain
+      if: contains(inputs.os, 'windows')
+      shell: pwsh
+      run: |
+        $tempDir = "C:\TEMP\intel_install"
+        New-Item -ItemType Directory -Force -Path $tempDir
+        cd $tempDir
+        $installerName = "w_HPCKit_p_2023.0.0.25931_offline.exe" # Consider using inputs.intel_version_windows if added
+        $installerUrl = "https://registrationcenter-download.intel.com/akdlm/irc_nas/19085/$installerName"
+        Write-Host "Downloading Intel oneAPI installer..."
+        curl.exe --output $installerName --url $installerUrl --retry 5 --retry-delay 5 -L # Added -L for potential redirects
+        Write-Host "Extracting installer..."
+        Start-Process -FilePath ".\$installerName" -ArgumentList "-s -x -f oneAPI --log extract.log" -Wait -NoNewWindow
+        Remove-Item ".\$installerName" -Force
+        Write-Host "Installing oneAPI components..."
+        # Install C++, Fortran, and MPI development tools silently
+        Start-Process -FilePath ".\oneAPI\bootstrapper.exe" -ArgumentList "-s --action install --eula=accept --components=""intel.oneapi.win.cpp-compiler:intel.oneapi.win.ifort-compiler:intel.oneapi.win.mpi.devel"" -p=NEED_VS2017_INTEGRATION=0 -p=NEED_VS2019_INTEGRATION=0 -p=NEED_VS2022_INTEGRATION=0 --log-dir=." -Wait -NoNewWindow
+        Write-Host "Cleaning up extracted files..."
+        Remove-Item ".\oneAPI" -Force -Recurse
+        cd ..
+        Remove-Item $tempDir -Force -Recurse
+
+    - name: (Windows) Test that OneAPI is installed
+      if: contains(inputs.os, 'windows')
+      shell: pwsh
+      run: |
+        $setvarsPath = "C:\Program Files (x86)\Intel\oneAPI\setvars.bat"
+        $compilerVarsPath = "C:\Program Files (x86)\Intel\oneAPI\compiler\latest\env\vars.bat"
+        if (-not (Test-Path -Path $setvarsPath -PathType Leaf)) {
+          Write-Error "Intel oneAPI setvars.bat not found at $setvarsPath"
+          exit 1
+        }
+        if (-not (Test-Path -Path $compilerVarsPath -PathType Leaf)) {
+          Write-Warning "Intel oneAPI compiler vars.bat not found at $compilerVarsPath. MPI might still work."
+          # Depending on requirements, you might want to 'exit 1' here too
+        }
+        Write-Host "Intel oneAPI installation paths verified."
+
+    - name: (Windows) Load OneAPI environment variables
+      if: contains(inputs.os, 'windows')
+      shell: cmd
+      run: |
+        call "C:\Program Files (x86)\Intel\oneAPI\setvars.bat" > NUL
+        echo "Setting Intel environment variables..."
+        echo "PATH=%PATH%" >> %GITHUB_ENV%
+        echo "INCLUDE=%INCLUDE%" >> %GITHUB_ENV%
+        echo "LIB=%LIB%" >> %GITHUB_ENV%
+        REM Add any other specific vars if needed, e.g., for MPI
+        echo "I_MPI_ROOT=%I_MPI_ROOT%" >> %GITHUB_ENV%
+        echo "FI_PROVIDER_PATH=%FI_PROVIDER_PATH%" >> %GITHUB_ENV%
+        echo "MPI_BIN=%MPI_BIN%" >> %GITHUB_ENV%
+
+    # --- Ubuntu Intel Setup ---
+    - name: (Ubuntu) Install prerequisites and Intel GPG key
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        sudo apt-get update -y -qq
+        sudo apt-get install -y -qq gpg wget ca-certificates curl gpg-agent software-properties-common
+        wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
+
+    - name: (Ubuntu) Add Intel oneAPI repository
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
+        sudo apt-get update -y -qq
+
+    - name: (Ubuntu) Install Intel oneAPI Compilers using fortran-lang action
+      if: contains(inputs.os, 'ubuntu')
+      uses: fortran-lang/setup-fortran@v1
+      with:
+        compiler: intel
+        version: 2024.1.0  # Pinned until issue #1090 is resolved
+
+    - name: (Ubuntu) Install Intel oneAPI MPI and build dependencies
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        # Install MPI devel package and common build tools
+        # The compilers (icc, ifort) should already be installed by setup-fortran action
+        sudo apt-get install -y -q intel-oneapi-mpi-devel intel-oneapi-mkl ninja-build cmake libcurl4-gnutls-dev
+
+    - name: (Ubuntu) Source oneAPI environment and add to GITHUB_ENV
+      if: contains(inputs.os, 'ubuntu')
+      shell: bash
+      run: |
+        # Source the main setvars script to set up the environment for this step
+        # Use --force as we might be in a non-interactive shell
+        source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
+        echo "Sourced setvars.sh. Adding key variables to GITHUB_ENV..."
+        # Explicitly add key variables to GITHUB_ENV for subsequent steps
+        echo "PATH=$PATH" >> $GITHUB_ENV
+        echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
+        echo "LIBRARY_PATH=$LIBRARY_PATH" >> $GITHUB_ENV
+        echo "CPATH=$CPATH" >> $GITHUB_ENV
+        echo "CMPLR_ROOT=$CMPLR_ROOT" >> $GITHUB_ENV # Example compiler root
+        echo "MPI_ROOT=$MPI_ROOT" >> $GITHUB_ENV     # MPI root (check actual variable name if needed, e.g., I_MPI_ROOT)
+        echo "I_MPI_ROOT=$I_MPI_ROOT" >> $GITHUB_ENV # Common variable name for Intel MPI root
+        echo "FI_PROVIDER_PATH=$FI_PROVIDER_PATH" >> $GITHUB_ENV # Often needed for MPI

.github/workflows/CI.yml

@@ -21,70 +21,76 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-11, windows-latest]
-        gcc_v: [10,11,12,13] # Version of GFortran we want to use.
+        os: [ubuntu-latest, macos-13, windows-latest]
+        toolchain:
+          - {compiler: gcc, version: 10}
+          - {compiler: gcc, version: 11}
+          - {compiler: gcc, version: 12}
+          - {compiler: gcc, version: 13}
+          - {compiler: gcc, version: 14}
+          - {compiler: intel, version: 2025.1}
+        exclude:
+          - os: macos-13  # No Intel on MacOS anymore since 2024
+            toolchain: {compiler: intel, version: '2025.1'}
+          - os: windows-latest  # Doesn't pass build and tests yet
+            toolchain: {compiler: intel, version: '2025.1'}
+          - os: windows-latest  # gcc 14 not available on Windows yet
+            toolchain: {compiler: gcc, version: 14}
         include:
-        - os: ubuntu-latest
-          os-arch: linux-x86_64
-          release-flags: --flag '--static -g -fbacktrace -O3'
-
-        - os: macos-11
-          os-arch: macos-x86_64
-          release-flags: --flag '-g -fbacktrace -O3'
-
-        - os: windows-latest
-          os-arch: windows-x86_64
-          release-flags: --flag '--static -g -fbacktrace -O3'
-          exe: .exe
-
-    env:
-      FC: gfortran
-      GCC_V: ${{ matrix.gcc_v }}
+          - os: ubuntu-latest
+            os-arch: linux-x86_64
+            release-flags: --flag '--static -g -fbacktrace -O3'
+          - os: macos-13
+            os-arch: macos-x86_64
+            release-flags: --flag '-g -fbacktrace -O3'
+          - os: windows-latest
+            os-arch: windows-x86_64
+            release-flags: --flag '--static -g -fbacktrace -O3'
+            exe: .exe
 
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
-    - name: Install GFortran macOS
-      if: contains(matrix.os, 'macos')
-      run: |
-        ln -s /usr/local/bin/gfortran-${GCC_V} /usr/local/bin/gfortran
-        which gfortran-${GCC_V}
-        which gfortran
-        # Backport gfortran shared libraries to version 9 folder. This is necessary because all macOS releases of fpm 
-        # have these paths hardcoded in the executable (no PIC?). As the gcc ABIs have not changed from 9 to 10, we 
-        # can just create symbolic links for now. This can be removed when an updated fpm release is built with gcc-10  
-        mkdir /usr/local/opt/gcc@9
-        mkdir /usr/local/opt/gcc@9/lib
-        mkdir /usr/local/opt/gcc@9/lib/gcc
-        mkdir /usr/local/opt/gcc@9/lib/gcc/9
-        mkdir /usr/local/lib/gcc/9
-        ln -fs /usr/local/opt/gcc@${GCC_V}/lib/gcc/${GCC_V}/libquadmath.0.dylib /usr/local/opt/gcc@9/lib/gcc/9/libquadmath.0.dylib 
-        ln -fs /usr/local/opt/gcc@${GCC_V}/lib/gcc/${GCC_V}/libgfortran.5.dylib /usr/local/opt/gcc@9/lib/gcc/9/libgfortran.5.dylib
-        ln -fs /usr/local/lib/gcc/${GCC_V}/libgcc_s.1.dylib /usr/local/lib/gcc/9/libgcc_s.1.dylib
-
-    - name: Install GFortran Linux
-      if: contains(matrix.os, 'ubuntu')
-      run: |
-        sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
-        --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
-        --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
-
-    - name: Install GFortran Windows
-      if: contains(matrix.os, 'windows')
-      run: |
-        Invoke-WebRequest -Uri $Env:GCC_DOWNLOAD -OutFile mingw-w64.zip
-        Expand-Archive mingw-w64.zip
-        echo "$pwd\mingw-w64\mingw64\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-      env:
-        GCC_DOWNLOAD: "https://github.com/brechtsanders/winlibs_mingw/releases/download/10.4.0-10.0.0-msvcrt-r1/winlibs-x86_64-posix-seh-gcc-10.4.0-mingw-w64msvcrt-10.0.0-r1.zip"
+    - name: Setup Fortran compiler
+      uses: fortran-lang/[email protected]
+      id: setup-fortran
+      with:
+        compiler: ${{ matrix.toolchain.compiler }}
+        version: ${{ matrix.toolchain.version }}
 
     # Phase 1: Bootstrap fpm with existing version
     - name: Install fpm
-      uses: fortran-lang/setup-fpm@v5
+      uses: fortran-lang/setup-fpm@v7
       with:
         fpm-version: 'v0.8.0'
 
+    # Backport gfortran shared libraries to version 10 folder. This is necessary because the macOS release of fpm
+    # 0.10.0 used for bootstrapping has these paths hardcoded in the executable.
+    - name: MacOS patch libgfortran
+      if: contains(matrix.os, 'macos') && !contains(matrix.toolchain.version, '10')
+      run: |
+        which gfortran-${{ matrix.toolchain.version }}
+        which gfortran
+        mkdir /usr/local/opt/gcc@10
+        mkdir /usr/local/opt/gcc@10/lib
+        mkdir /usr/local/opt/gcc@10/lib/gcc
+        mkdir /usr/local/opt/gcc@10/lib/gcc/10
+        mkdir /usr/local/lib/gcc/10
+        ln -fs /usr/local/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libquadmath.0.dylib /usr/local/opt/gcc@10/lib/gcc/10/libquadmath.0.dylib
+        ln -fs /usr/local/opt/gcc@${{ matrix.toolchain.version }}/lib/gcc/${{ matrix.toolchain.version }}/libgfortran.5.dylib /usr/local/opt/gcc@10/lib/gcc/10/libgfortran.5.dylib
+        ln -fs /usr/local/lib/gcc/${{ matrix.toolchain.version }}/libgcc_s.1.dylib /usr/local/lib/gcc/10/libgcc_s.1.dylib
+
+    # gcc and g++ will point to clang/clang++: use versioned alias for fpm
+    - name: MacOS patch C and C++ compilers
+      if: contains(matrix.os, 'macos')
+      run: |
+        echo "CC=gcc-${{ matrix.toolchain.version }}" >> $GITHUB_ENV
+        echo "FPM_CC=gcc-${{ matrix.toolchain.version }}" >> $GITHUB_ENV
+        echo "CXX=g++-${{ matrix.toolchain.version }}" >> $GITHUB_ENV
+        echo "FPM_CXX=g++-${{ matrix.toolchain.version }}" >> $GITHUB_ENV
+        echo "FPM_LDFLAGS=-lstdc++" >> $GITHUB_ENV
+
     - name: Remove fpm from path
       shell: bash
       run: |
@@ -94,7 +100,7 @@ jobs:
     - name: Build Fortran fpm (bootstrap)
       shell: bash
       run: |
-        ${{ env.BOOTSTRAP }} build 
+        ${{ env.BOOTSTRAP }} build
 
     - name: Run Fortran fpm (bootstrap)
       shell: bash
@@ -139,11 +145,6 @@ jobs:
       env:
         REGEX: '[0-9]\{1,4\}\.[0-9]\{1,4\}\.[0-9]\{1,4\}'
 
-    - name: Build example packages
-      shell: bash
-      run: |
-        ci/run_tests.sh "${{ env.FPM }}"
-
     - name: Build Fortran fpm
       shell: bash
       run: |
@@ -173,15 +174,15 @@ jobs:
         rm -v ${{ env.FPM }}
         echo "FPM_RELEASE=${{ env.EXE }}" >> $GITHUB_ENV
       env:
-        EXE: fpm-${{ env.VERSION }}-${{ matrix.os-arch }}${{ matrix.exe }}
+        EXE: fpm-${{ env.VERSION }}-${{ matrix.os-arch }}-gcc-${{ matrix.toolchain.version }}${{ matrix.exe }}
 
     - name: Run release version
       shell: bash
       run: |
         ci/run_tests.sh "$PWD/${{ env.FPM_RELEASE }}"
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ env.FPM_RELEASE }}
         path: ${{ env.FPM_RELEASE }}
@@ -192,14 +193,19 @@ jobs:
     runs-on: windows-latest
     needs:
       - build
-    
+    strategy:
+      fail-fast: false
+      matrix:
+        gcc_v: [11,12,13]
+
     steps:
     - uses: actions/checkout@v4
 
     - name: Download Artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
-        path: ${{ github.workspace }} # This will download all files
+        path: ${{ github.workspace }}
+        pattern: fpm-*-windows-*-gcc-${{ matrix.gcc_v }}.exe
 
     - name: Get version (normal)
       if: github.event_name != 'release'
@@ -229,7 +235,7 @@ jobs:
     - name: Fetch Windows executable
       shell: msys2 {0}
       run: |
-        cp fpm-*/fpm*.exe ./ci/fpm.exe
+        cp fpm-*/fpm-*-windows-*-gcc-${{ matrix.gcc_v }}.exe ./ci/fpm.exe
 
     - name: Fetch Git for Windows
       shell: msys2 {0}
@@ -254,13 +260,13 @@ jobs:
       run: |
         cd ./ci
         makensis fpm-installer.nsi
-        move fpm-installer.exe fpm-installer-${{ env.VERSION }}.exe
+        move fpm-installer.exe fpm-installer-${{ env.VERSION }}-gcc-${{ matrix.gcc_v }}.exe
 
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: fpm-installer
-        path: ci/fpm-installer-${{ env.VERSION }}.exe
+        name: fpm-installer-gcc-${{ matrix.gcc_v }}
+        path: ci/fpm-installer-${{ env.VERSION }}-gcc-${{ matrix.gcc_v }}.exe
 
   upload-artifacts:
     if: ${{ github.event_name == 'release' && contains(github.ref, 'v') || github.event_name == 'push' }}
@@ -281,27 +287,27 @@ jobs:
       if: ${{ github.event_name == 'push' }}
 
     - name: Download Artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
-        path: ${{ github.workspace }} # This will download all files
+        path: fpm-cd-artifacts
+        pattern: 'fpm-*-gcc-12*'
+        merge-multiple: true
 
     - name: Normalize file names for continuous delivery
       if: ${{ github.event_name == 'push' }}
       run: |
-        for output in fpm-*/fpm*; do
-          pushd $(dirname "$output")
+        cd fpm-cd-artifacts
+        for output in fpm-*; do
           mv -v $(basename $output) $(basename $output | sed -E '${{ env.replace }}')
-          popd
         done
       env:
         replace: 's/-([0-9]+\.[0-9]+\.[0-9]+-[0-9]+-g)?[0-9a-f]+//'
 
     - name: Create SHA256 checksums
       run: |
-        for output in fpm-*/fpm*; do
-          pushd $(dirname "$output")
+        cd fpm-cd-artifacts
+        for output in fpm-*; do
           sha256sum $(basename "$output") | tee $(basename "$output").sha256
-          popd
         done
 
     - name: Move/Create continuous tag
@@ -315,7 +321,7 @@ jobs:
       if: ${{ github.event_name == 'release' || steps.deploy-on-push.outputs.result != 0 }}
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
-        file: fpm-*/fpm*
+        file: fpm-cd-artifacts/*
         file_glob: true
         tag: ${{ github.event_name == 'release' && github.ref || 'current'}}
         overwrite: true

.github/workflows/docs.yml

@@ -14,7 +14,7 @@ jobs:
       run: pip install ford
     - name: Build Documentation
       run: ford docs.md
-    - uses: JamesIves/github-pages-deploy-action@3.7.1
+    - uses: JamesIves/github-pages-deploy-action@v4.7.3
       if: github.event_name == 'push' && github.repository == 'fortran-lang/fpm' && ( startsWith( github.ref, 'refs/tags/' ) || github.ref == 'refs/heads/main' )
       with:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}