Skip to content

Commit 86e76d4

Browse files
scivisionscivision
committed
consolidate CI and json
1 parent 824366d commit 86e76d4

3 files changed

Lines changed: 45 additions & 86 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
name: ci
22

33
env:
4-
CTEST_NO_TESTS_ACTION: error
5-
CTEST_PARALLEL_LEVEL: 0
4+
HOMEBREW_NO_INSTALL_CLEANUP: 1
65

76
on:
87
push:
@@ -83,6 +82,7 @@ jobs:
8382
fail-fast: false
8483
matrix:
8584
gcc-version: [8]
85+
cmake_version: [4.3.2]
8686
# GCC 7 works, but just didn't feel the need to test so old a version
8787

8888
env: *gcc-env
@@ -95,16 +95,13 @@ jobs:
9595
9696
- name: install CMake
9797
run: |
98-
curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null
99-
echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null
100-
apt-get update
101-
test -f /usr/share/doc/kitware-archive-keyring/copyright || rm /usr/share/keyrings/kitware-archive-keyring.gpg
102-
apt-get install --no-install-recommends -y kitware-archive-keyring
103-
apt-get install --no-install-recommends -y cmake
98+
curl -LO "https://github.com/Kitware/CMake/releases/download/v${{ matrix.cmake_version }}/cmake-${{ matrix.cmake_version }}-linux-x86_64.tar.gz"
99+
tar -xf cmake-${{ matrix.cmake_version }}-linux-x86_64.tar.gz --exclude=doc/ --exclude=man/ --exclude=Help/
100+
echo "CMAKE=$GITHUB_WORKSPACE/cmake-${{ matrix.cmake_version }}-linux-x86_64/bin/cmake" >> $GITHUB_ENV
104101
105102
- *checkout
106103

107-
- *default-workflow
104+
- run: $CMAKE --workflow gmake
108105

109106

110107
valgrind-memory:
@@ -123,33 +120,34 @@ jobs:
123120
- run: ctest -S memcheck.cmake -VV -E "sleep|string_array|string_view|binding_derived"
124121

125122

126-
linux-flang:
127-
runs-on: ubuntu-latest
128-
timeout-minutes: 15
123+
# just saving CI time
124+
# linux-flang:
125+
# runs-on: ubuntu-latest
126+
# timeout-minutes: 15
129127

130-
strategy:
131-
matrix:
132-
llvm-version: [21]
128+
# strategy:
129+
# matrix:
130+
# llvm-version: [21]
133131

134-
steps:
135-
- *checkout
132+
# steps:
133+
# - *checkout
136134

137-
- name: Apt LLVM
138-
run: |
139-
wget https://apt.llvm.org/llvm.sh
140-
chmod +x llvm.sh
141-
sudo ./llvm.sh ${{ matrix.llvm-version }}
142-
sudo apt-get update
135+
# - name: Apt LLVM
136+
# run: |
137+
# wget https://apt.llvm.org/llvm.sh
138+
# chmod +x llvm.sh
139+
# sudo ./llvm.sh ${{ matrix.llvm-version }}
140+
# sudo apt-get update
143141

144-
- name: install Flang
145-
run: sudo apt install --no-install-recommends clang-${{ matrix.llvm-version }} flang-${{ matrix.llvm-version }}
146-
# MUST specify version here or default old Clang used despite LLVM apt docs
142+
# - name: install Flang
143+
# run: sudo apt install --no-install-recommends clang-${{ matrix.llvm-version }} flang-${{ matrix.llvm-version }}
144+
# # MUST specify version here or default old Clang used despite LLVM apt docs
147145

148-
- uses: ./.github/workflows/composite-unix
149-
env:
150-
CC: clang-${{ matrix.llvm-version }}
151-
CXX: clang++-${{ matrix.llvm-version }}
152-
FC: flang-${{ matrix.llvm-version }}
146+
# - uses: ./.github/workflows/composite-unix
147+
# env:
148+
# CC: clang-${{ matrix.llvm-version }}
149+
# CXX: clang++-${{ matrix.llvm-version }}
150+
# FC: flang-${{ matrix.llvm-version }}
153151

154152

155153
mac:
@@ -200,7 +198,7 @@ jobs:
200198

201199
- *checkout
202200

203-
- run: cmake --workflow ninja
201+
- run: cmake --workflow default
204202

205203
- name: upload CMakeConfigureLog.yaml
206204
if: failure() && hashFiles('build/CMakeFiles/CMakeConfigureLog.yaml') != ''

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
steps:
99

1010
- name: Ninja build and test
11-
run: cmake --workflow ninja --fresh
11+
run: cmake --workflow default --fresh
1212
shell: bash
1313

1414
- name: GNU Make build and test

‎CMakePresets.json‎

Lines changed: 14 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,16 @@
55
{
66
"name": "default",
77
"binaryDir": "build",
8+
"generator": "Ninja",
89
"cacheVariables": {
910
"CMAKE_BUILD_TYPE": "Release",
1011
"CMAKE_COMPILE_WARNING_AS_ERROR": true,
1112
"CMAKE_LINK_WARNING_AS_ERROR": true
1213
}
1314
},
14-
{ "name": "ninja", "inherits": "default",
15-
"generator": "Ninja"
16-
},
1715
{ "name": "gmake", "inherits": "default",
1816
"generator": "Unix Makefiles"
1917
},
20-
{ "name": "build", "inherits": "default"},
2118
{
2219
"name": "debug", "inherits": "default",
2320
"cacheVariables": {
@@ -37,13 +34,11 @@
3734
}
3835
],
3936
"buildPresets": [
40-
{ "name": "default", "configurePreset": "default", "configuration": "Release", "jobs": 0 },
41-
{ "name": "build", "inherits": "default", "configurePreset": "build" },
37+
{ "name": "default", "configurePreset": "default", "configuration": "Release"},
4238
{ "name": "msvc", "inherits": "default", "configurePreset": "msvc" },
4339
{ "name": "debug", "inherits": "default", "configurePreset": "debug", "configuration": "Debug" },
4440
{ "name": "reldebug", "inherits": "default", "configurePreset": "reldebug", "configuration": "RelWithDebInfo" },
45-
{ "name": "ninja", "configurePreset": "ninja" },
46-
{ "name": "gmake", "inherits": "default", "configurePreset": "gmake" }
41+
{ "name": "gmake", "inherits": "default", "configurePreset": "gmake", "jobs": 4 }
4742
],
4843
"testPresets": [
4944
{
@@ -73,62 +68,28 @@
7368
"configurePreset": "debug",
7469
"configuration": "Debug"
7570
},
76-
{ "name": "ninja", "configurePreset": "ninja" },
7771
{ "name": "gmake", "configurePreset": "gmake" }
7872
],
7973
"workflowPresets": [
80-
{
81-
"name": "default",
82-
"displayName": "build and test",
83-
"steps": [
74+
{ "name": "default", "displayName": "build and test", "steps": [
8475
{ "type": "configure", "name": "default" },
8576
{ "type": "build", "name": "default" },
86-
{ "type": "test", "name": "default" }
87-
]
88-
},
89-
{
90-
"name": "build",
91-
"displayName": "build only",
92-
"steps": [
93-
{ "type": "configure", "name": "build" },
94-
{ "type": "build", "name": "build" }
95-
]
96-
},
97-
{
98-
"name": "debug",
99-
"displayName": "Debug build and test",
100-
"steps": [
77+
{ "type": "test", "name": "default" } ] },
78+
{ "name": "build", "displayName": "build only", "steps": [
79+
{ "type": "configure", "name": "default" },
80+
{ "type": "build", "name": "default" } ] },
81+
{ "name": "debug", "displayName": "Debug build and test", "steps": [
10182
{ "type": "configure", "name": "debug" },
10283
{ "type": "build", "name": "debug" },
103-
{ "type": "test", "name": "debug" }
104-
]
105-
},
106-
{
107-
"name": "msvc",
108-
"displayName": "MSVC build and test",
109-
"steps": [
84+
{ "type": "test", "name": "debug" } ] },
85+
{ "name": "msvc", "displayName": "MSVC build and test", "steps": [
11086
{ "type": "configure", "name": "msvc" },
11187
{ "type": "build", "name": "msvc" },
112-
{ "type": "test", "name": "msvc" }
113-
]
114-
},
115-
{
116-
"name": "ninja",
117-
"displayName": "Ninja build and test",
118-
"steps": [
119-
{ "type": "configure", "name": "ninja" },
120-
{ "type": "build", "name": "ninja" },
121-
{ "type": "test", "name": "ninja" }
122-
]
123-
},
124-
{
125-
"name": "gmake",
126-
"displayName": "GNU Make build and test",
127-
"steps": [
88+
{ "type": "test", "name": "msvc" } ] },
89+
{ "name": "gmake", "displayName": "GNU Make build and test", "steps": [
12890
{ "type": "configure", "name": "gmake" },
12991
{ "type": "build", "name": "gmake" },
130-
{ "type": "test", "name": "gmake" }
131-
]
92+
{ "type": "test", "name": "gmake" } ]
13293
}
13394
]
13495
}

0 commit comments

Comments
 (0)