Skip to content

Commit 6d5f0c4

Browse files
committed
ci: add flang, composite-pkg
1 parent b864867 commit 6d5f0c4

File tree

3 files changed

+69
-20
lines changed

3 files changed

+69
-20
lines changed

.github/workflows/ci.yml

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
name: ci
22

33
env:
4-
CMAKE_TLS_VERIFY: true
54
HOMEBREW_NO_INSTALL_CLEANUP: 1
65
CTEST_NO_TESTS_ACTION: error
7-
CTEST_PARALLEL_LEVEL: 4
6+
CTEST_PARALLEL_LEVEL: 0
87
CMAKE_BUILD_PARALLEL_LEVEL: 4
98
CMAKE_INSTALL_PREFIX: ~/libs
109
CMAKE_PREFIX_PATH: ~/libs
@@ -25,7 +24,7 @@ on:
2524

2625
jobs:
2726

28-
gcc-12-13-14:
27+
gcc-new:
2928
timeout-minutes: 15
3029

3130
strategy:
@@ -56,10 +55,11 @@ jobs:
5655
if: runner.os == 'Linux'
5756
run: echo "CC=gcc-${{ matrix.gcc }}" >> $GITHUB_ENV
5857

58+
- uses: ./.github/workflows/composite-pkg
5959
- uses: ./.github/workflows/composite-unix
6060

6161

62-
gcc-9-10-11:
62+
gcc-old:
6363
timeout-minutes: 15
6464

6565
strategy:
@@ -74,12 +74,44 @@ jobs:
7474

7575
steps:
7676
- uses: actions/checkout@v4
77+
- uses: ./.github/workflows/composite-pkg
7778
- uses: ./.github/workflows/composite-unix
7879

7980

81+
linux-flang:
82+
runs-on: ubuntu-latest
83+
timeout-minutes: 15
84+
85+
strategy:
86+
matrix:
87+
llvm-version: [20]
88+
cpp: [true, false]
89+
shared: [false]
90+
91+
env:
92+
CC: clang-${{ matrix.llvm-version }}
93+
CXX: clang++-${{ matrix.llvm-version }}
94+
FC: flang-${{ matrix.llvm-version }}
95+
96+
steps:
97+
- name: Apt LLVM
98+
run: |
99+
wget https://apt.llvm.org/llvm.sh
100+
chmod +x llvm.sh
101+
sudo ./llvm.sh ${{ matrix.llvm-version }}
102+
sudo apt-get update
103+
104+
- name: install Flang
105+
run: sudo apt install --no-install-recommends clang-${{ matrix.llvm-version }} flang-${{ matrix.llvm-version }}
106+
107+
- uses: actions/checkout@v4
108+
- uses: ./.github/workflows/composite-unix
109+
110+
111+
80112
valgrind-memory:
81113
runs-on: ubuntu-latest
82-
needs: core-gcc
114+
needs: gcc-new
83115
timeout-minutes: 10
84116

85117
steps:
@@ -97,7 +129,7 @@ jobs:
97129
# issue with python loading writer.inc
98130
linux-coverage:
99131
if: false
100-
needs: core-gcc
132+
needs: gcc-new
101133
runs-on: ubuntu-latest
102134
timeout-minutes: 10
103135

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: "pkgs"
2+
3+
runs:
4+
5+
using: "composite"
6+
7+
steps:
8+
9+
- uses: actions/setup-python@v5
10+
with:
11+
python-version: '3.12'
12+
13+
- name: Python pkgs
14+
shell: bash
15+
run: pip install numpy h5py
16+
17+
- name: install HDF5 (Linux)
18+
shell: bash
19+
if: runner.os == 'Linux'
20+
run: |
21+
sudo apt update
22+
sudo apt install --no-install-recommends libhdf5-dev
23+
24+
- name: Install HDF5 (MacOS)
25+
shell: bash
26+
if: runner.os == 'macOS'
27+
run: brew install hdf5

.github/workflows/composite-unix/action.yml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,15 @@ runs:
66

77
steps:
88

9-
- uses: actions/setup-python@v5
10-
with:
11-
python-version: '3.12'
12-
13-
- name: Python pkgs
14-
shell: bash
15-
run: pip install numpy h5py
16-
17-
- name: install HDF5 (Linux)
9+
- name: install Ninja (Linux)
1810
shell: bash
1911
if: runner.os == 'Linux'
20-
run: |
21-
sudo apt update
22-
sudo apt install --no-install-recommends ninja-build libhdf5-dev
12+
run: sudo apt install --no-install-recommends ninja-build
2313

24-
- name: Install HDF5 (MacOS)
14+
- name: Install Ninja (MacOS)
2515
shell: bash
2616
if: runner.os == 'macOS'
27-
run: brew install hdf5 ninja
17+
run: brew install ninja
2818

2919
- name: Configure
3020
shell: bash

0 commit comments

Comments
 (0)