Skip to content

Commit 94919fa

Browse files
committed
Revert change in CI/CD for IFX
1 parent cb55ff0 commit 94919fa

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.github/workflows/meta.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ on:
44
# On push, only run if any of the metapackage files has changed
55
push:
66
paths:
7-
- 'src/*meta*.f90'
7+
- 'src/*meta*.f90'
88
- 'src/fpm/*meta*.f90'
99
- 'src/fpm/manifest/*meta*.f90'
1010
- 'src/ci/meta_tests.sh'
1111
- 'src/.github/workflows/meta.yml'
12-
# Always run on PR or release
12+
# Always run on PR or release
1313
pull_request:
1414
release:
1515
types: [published]
1616
# Allow manual triggering
17-
workflow_dispatch:
17+
workflow_dispatch:
1818

1919
env:
2020
CI: "ON" # We can detect this in the build system and other vendors implement it
@@ -51,7 +51,7 @@ jobs:
5151

5252
- name: (Ubuntu/macOS) setup gcc version
5353
if: contains(matrix.os,'ubuntu') || contains(matrix.os,'macos')
54-
run: |
54+
run: |
5555
echo "GCC_V=14" >> $GITHUB_ENV
5656
5757
- name: (Windows) Install MSYS2
@@ -84,7 +84,7 @@ jobs:
8484
Remove-Item "oneAPI" -Force -Recurse
8585
8686
- name: (Ubuntu) Install gfortran
87-
if: contains(matrix.os,'ubuntu')
87+
if: contains(matrix.os,'ubuntu')
8888
run: |
8989
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
9090
--slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
@@ -115,16 +115,16 @@ jobs:
115115
uses: fortran-lang/[email protected]
116116
id: setup-fortran
117117
with:
118-
compiler: intel
119-
version: 2024.1.0
118+
compiler: intel
119+
version: 2024.1.0
120120

121-
- name: (Ubuntu) finalize oneAPI environment
121+
- name: (Ubuntu) finalize oneAPI environment
122122
if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
123123
run: |
124124
# Install MPI
125125
sudo apt-get install -y -q intel-oneapi-mpi-devel ninja-build cmake
126126
source /opt/intel/oneapi/setvars.sh --force
127-
printenv >> $GITHUB_ENV
127+
printenv >> $GITHUB_ENV
128128
# To run HDF5 with oneAPI, we need to build it from source. Use CMake to generate pkg-config info
129129
curl -O -L https://github.com/HDFGroup/hdf5/archive/refs/tags/snapshot-1.14.tar.gz
130130
tar zxf snapshot-1.14.tar.gz
@@ -214,8 +214,8 @@ jobs:
214214
215215
- name: (macOS) Install homebrew HDF5
216216
if: contains(matrix.os,'macos')
217-
run: |
218-
brew install hdf5
217+
run: |
218+
brew install hdf5
219219
220220
# Phase 1: Bootstrap fpm with existing version
221221
- name: Install fpm
@@ -229,8 +229,8 @@ jobs:
229229
mv $(which fpm) fpm-bootstrap${{ matrix.exe }}
230230
echo "BOOTSTRAP=$PWD/fpm-bootstrap" >> $GITHUB_ENV
231231
232-
- name: (macOS) Use gcc/g++ instead of Clang for C/C++ to build fpm
233-
if: contains(matrix.os,'macOS')
232+
- name: (macOS/Ubuntu) Use gcc/g++ instead of Clang for C/C++ / ifx to build fpm
233+
if: contains(matrix.os,'macOS') || contains(matrix.os,'ubuntu')
234234
shell: bash
235235
run: |
236236
echo "FPM_FC=gfortran-${{ env.GCC_V }}" >> $GITHUB_ENV

0 commit comments

Comments
 (0)