Skip to content

Commit 716b4d5

Browse files
committed
ci: template
1 parent e04ff49 commit 716b4d5

File tree

2 files changed

+13
-28
lines changed

2 files changed

+13
-28
lines changed

.github/workflows/cmake.yml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ env:
44
CTEST_NO_TESTS_ACTION: error
55
HOMEBREW_NO_INSTALL_CLEANUP: 1
66
CTEST_PARALLEL_LEVEL: 0
7-
CMAKE_BUILD_PARALLEL_LEVEL: 4
87

98
on:
109
push:
@@ -36,16 +35,8 @@ jobs:
3635
steps:
3736
- uses: actions/checkout@v4
3837

39-
- name: install Ninja
40-
if: runner.os == 'Linux'
41-
run: sudo apt install --no-install-recommends ninja-build
42-
43-
- name: install Ninja
44-
if: runner.os == 'macOS'
45-
run: brew install ninja
46-
47-
- run: cmake --workflow --preset debug
48-
- run: cmake --workflow --preset release
38+
- run: cmake --workflow debug
39+
- run: cmake --workflow release
4940

5041

5142
gcc-old:
@@ -62,11 +53,8 @@ jobs:
6253
steps:
6354
- uses: actions/checkout@v4
6455

65-
- name: install Ninja
66-
run: sudo apt install --no-install-recommends ninja-build
67-
68-
- run: cmake --workflow --preset debug
69-
- run: cmake --workflow --preset release
56+
- run: cmake --workflow debug
57+
- run: cmake --workflow release
7058

7159

7260
linux-flang:
@@ -88,7 +76,7 @@ jobs:
8876
- name: install Flang
8977
run: sudo apt install --no-install-recommends flang
9078

91-
- run: cmake --workflow --preset default
79+
- run: cmake --workflow default
9280

9381

9482
windows:
@@ -97,16 +85,16 @@ jobs:
9785

9886
steps:
9987
- uses: msys2/setup-msys2@v2
88+
id: msys2
10089
with:
10190
update: true
10291
install: >-
103-
mingw-w64-x86_64-ninja
104-
mingw-w64-x86_64-gcc-fortran
92+
mingw-w64-ucrt-x86_64-gcc-fortran
10593
10694
- name: Put MSYS2_MinGW64 on PATH
107-
run: echo "${{ runner.temp }}/msys64/mingw64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
95+
run: echo "${{ steps.msys2.outputs.msys2-location }}/ucrt64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
10896

10997
- uses: actions/checkout@v4
11098

111-
- run: cmake --workflow --preset debug
112-
- run: cmake --workflow --preset release
99+
- run: cmake --workflow debug
100+
- run: cmake --workflow release

.github/workflows/oneapi-linux.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ on:
2121
- "**/CMakeLists.txt"
2222
- ".github/workflows/oneapi-linux.yml"
2323
- ".github/workflows/oneapi*.sh"
24-
- "!memcheck.cmake"
25-
- "!coverage.cmake"
26-
- "!example/*"
2724
workflow_dispatch:
2825

2926
# avoid wasted runs
@@ -40,7 +37,7 @@ jobs:
4037

4138
strategy:
4239
matrix:
43-
oneapi: [2025.1]
40+
oneapi: [2025.2]
4441
steps:
4542
- uses: actions/checkout@v4
4643

@@ -57,7 +54,7 @@ jobs:
5754
timeout-minutes: 5
5855
run: |
5956
.github/workflows/oneapi_setup_apt_repo_linux.sh
60-
sudo apt install --no-install-recommends intel-oneapi-compiler-dpcpp-cpp-${{ matrix.oneapi }} intel-oneapi-compiler-fortran-${{ matrix.oneapi }}
57+
sudo apt install --no-install-recommends intel-oneapi-compiler-fortran-${{ matrix.oneapi }}
6158
6259
- name: Setup Intel oneAPI environment
6360
run: |
@@ -71,7 +68,7 @@ jobs:
7168
if: failure()
7269
uses: actions/upload-artifact@v4
7370
with:
74-
name: oneapi-${{ matrix.onapi }}-${{ runner.os }}-CMakeConfigureLog.yaml
71+
name: oneapi-${{ matrix.oneapi }}-${{ runner.os }}-CMakeConfigureLog.yaml
7572
path: build/CMakeFiles/CMakeConfigureLog.yaml
7673

7774
- name: exclude unused files from cache

0 commit comments

Comments
 (0)