Skip to content

Commit 584eaad

Browse files
committed
Added flang to build matrix
1 parent 05a47f7 commit 584eaad

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

.github/workflows/cmake-multi-platform.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
66
# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
7-
name: CMake on multiple platforms
7+
name: Linux C/Fortran compiler combinations build
88

99
on:
1010
push:
11-
branches: ["gmp"]
11+
branches: ["main"]
1212
pull_request:
1313
branches: ["main"]
1414

@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-latest]
3131
c_compiler: [gcc, clang]
32-
f_compiler: [gfortran]
32+
f_compiler: [gfortran, flang]
3333
# exclude:
3434
# - c_compiler: gcc
3535
# f_compiler: flang
@@ -42,7 +42,7 @@ jobs:
4242
echo "GOTMDIR=$GOTMDIR" >> $GITHUB_ENV
4343
4444
- name: Checkout OxyPOM repository
45-
uses: actions/checkout@v4
45+
uses: actions/checkout@v5
4646

4747
- name: Set reusable strings
4848
# Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
@@ -63,7 +63,7 @@ jobs:
6363
${{ matrix.c_compiler }} --version
6464
${{ matrix.f_compiler }} --version
6565
66-
- name: CMake
66+
- name: "CMake configure"
6767
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
6868
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
6969
run: >
@@ -74,5 +74,5 @@ jobs:
7474
-DGOTM_USE_FABM=ON -DFABM_USE_IEEE_ARITHMETIC=OFF
7575
-DFABM_OXYPOM_BASE=/home/runner/work/fabm-oxypom/fabm-oxypom/src -DFABM_INSTITUTES="gotm;oxypom"
7676
77-
- name: Make
78-
run: make -C ${{ steps.strings.outputs.build-output-dir }}
77+
- name: "CMake build"
78+
run: cmake --build ${{ steps.strings.outputs.build-output-dir }}

.github/workflows/fabm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
packages: write
2222
steps:
2323
- name: Check out repository
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v5
2525

2626
- name: Log in to GitHub Container Registry
2727
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin

0 commit comments

Comments
 (0)