Skip to content

Commit 0d8fbfa

Browse files
committed
Updates GitHub build workflow to be compatible with new runner images.
1 parent 2d9e3c7 commit 0d8fbfa

2 files changed

Lines changed: 23 additions & 37 deletions

File tree

.github/workflows/build.yml

Lines changed: 22 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -11,67 +11,53 @@ jobs:
1111
strategy:
1212
matrix:
1313
include:
14-
- name: "[Ubuntu] gcc-9"
15-
os: ubuntu-latest
16-
CC: gcc-9
17-
CXX: g++-9
14+
- name: "[Ubuntu] gcc-12"
15+
os: ubuntu-22.04
16+
CC: gcc-12
17+
CXX: g++-12
1818
CXXFLAGS: -Wno-maybe-uninitialized
19-
FC: gfortran-9
20-
GCOV: gcov-9
19+
FC: gfortran-12
20+
GCOV: gcov-12
2121
OCCA_COVERAGE: 1
2222
OCCA_FORTRAN_ENABLED: 1
2323

24-
- name: "[Ubuntu] CMake + gcc-9"
25-
os: ubuntu-latest
26-
CC: gcc-9
27-
CXX: g++-9
24+
- name: "[Ubuntu] CMake + gcc-12"
25+
os: ubuntu-22.04
26+
CC: gcc-12
27+
CXX: g++-12
2828
CXXFLAGS: -Wno-maybe-uninitialized -Wno-cpp
29-
FC: gfortran-9
30-
GCOV: gcov-9
31-
OCCA_COVERAGE: 1
29+
FC: gfortran-12
3230
OCCA_FORTRAN_ENABLED: 1
3331
useCMake: true
3432

35-
- name: "[Ubuntu] clang-11"
36-
os: ubuntu-latest
37-
CC: clang-11
38-
CXX: clang++-11
33+
- name: "[Ubuntu] clang-14"
34+
os: ubuntu-22.04
35+
CC: clang-14
36+
CXX: clang++-14
3937
CXXFLAGS: -Wno-uninitialized
4038
OCCA_COVERAGE: 0
4139

42-
- name: "[Ubuntu] clang-10"
43-
os: ubuntu-latest
44-
CC: clang-10
45-
CXX: clang++-10
40+
- name: "[Ubuntu] clang-12"
41+
os: ubuntu-22.04
42+
CC: clang-12
43+
CXX: clang++-12
4644
CXXFLAGS: -Wno-uninitialized
4745
OCCA_COVERAGE: 0
4846

4947
- name: "[Ubuntu] CMake + Intel/LLVM"
50-
os: ubuntu-latest
48+
os: ubuntu-22.04
5149
CC: icx
5250
CXX: icpx
5351
CXXFLAGS: -Wno-uninitialized
54-
FC: ifx
55-
GCOV: gcov-9
56-
OCCA_COVERAGE: 1
52+
OCCA_COVERAGE: 0
5753
useCMake: true
5854
useoneAPI: true
5955

60-
- name: "[MacOS] gcc-9"
61-
os: macos-latest
62-
CC: gcc-9
63-
CXX: g++-9
64-
CXXFLAGS: -Wno-maybe-uninitialized
65-
GCOV: gcov-9
66-
OCCA_COVERAGE: 1
67-
6856
- name: "[MacOS] clang"
69-
os: macos-latest
57+
os: macos-12
7058
CC: clang
7159
CXX: clang++
7260
CXXFLAGS: -Wno-uninitialized
73-
OCCA_COVERAGE: 0
74-
7561

7662
runs-on: ${{ matrix.os }}
7763
name: ${{ matrix.name }}

scripts/build/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ else
122122
endif
123123

124124
ifeq ($(OCCA_COVERAGE),1)
125-
coverageFlags = --coverage -fno-inline -fno-inline-small-functions -fno-default-inline
125+
coverageFlags = --coverage
126126
compilerFlags += $(coverageFlags)
127127
cCompilerFlags += $(coverageFlags)
128128
fCompilerFlags += $(coverageFlags)

0 commit comments

Comments
 (0)