Skip to content

Commit f618810

Browse files
neatudariusneatudarius
authored
Merge pull request #23 from neatudarius/tweaks-in-docs-for-alpha
Tweaks for alpha release
2 parents 2a60bc7 + ef6c4ec commit f618810

20 files changed

+357
-161
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.bib -linguist-detectable
2+
*.tex -linguist-detectable
3+
papers/* linguist-documentation

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,28 @@
11
name: Test
2-
32
on:
43
push:
5-
branches: [ main ]
4+
branches: [main]
65
pull_request:
7-
branches: [ main ]
8-
6+
branches: [main]
97
jobs:
108
build:
119
name: ${{ matrix.config.name }}
1210
runs-on: ${{ matrix.config.os }}
13-
1411
strategy:
1512
fail-fast: false
16-
1713
matrix:
1814
config:
19-
- {
20-
name: "Ubuntu Clang 17",
21-
os: ubuntu-24.04,
22-
toolchain: "clang-17-toolchain.cmake",
23-
clang_version: 17,
24-
installed_clang_version: 14,
25-
cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "
26-
}
27-
28-
- {
29-
name: "Ubuntu Clang 18",
30-
os: ubuntu-24.04,
31-
toolchain: "clang-18-toolchain.cmake",
32-
clang_version: 18,
33-
installed_clang_version: 14,
34-
cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "
35-
}
36-
37-
- {
38-
name: "Ubuntu GCC 13",
39-
os: ubuntu-24.04,
40-
toolchain: "gcc-13-toolchain.cmake",
41-
clang_version: 17,
42-
installed_clang_version: 14,
43-
cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "
44-
}
45-
46-
- {
47-
name: "Ubuntu GCC 14",
48-
os: ubuntu-24.04,
49-
toolchain: "gcc-14-toolchain.cmake",
50-
clang_version: 17,
51-
installed_clang_version: 14,
52-
cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "
53-
}
54-
15+
- {name: "Ubuntu Clang 17", os: ubuntu-24.04, toolchain: "clang-17-toolchain.cmake", clang_version: 17, installed_clang_version: 14, cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
16+
- {name: "Ubuntu Clang 18", os: ubuntu-24.04, toolchain: "clang-18-toolchain.cmake", clang_version: 18, installed_clang_version: 14, cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
17+
- {name: "Ubuntu GCC 13", os: ubuntu-24.04, toolchain: "gcc-13-toolchain.cmake", clang_version: 17, installed_clang_version: 14, cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
18+
- {name: "Ubuntu GCC 14", os: ubuntu-24.04, toolchain: "gcc-14-toolchain.cmake", clang_version: 17, installed_clang_version: 14, cmake_args: "-G \"Ninja Multi-Config\" -DCMAKE_CONFIGURATION_TYPES=\"RelWithDebInfo;Asan\" "}
5519
steps:
5620
- uses: actions/checkout@v3
5721
with:
5822
submodules: 'true'
59-
6023
- uses: seanmiddleditch/gha-setup-ninja@master
61-
6224
- name: Activate verbose shell
6325
run: set -x
64-
6526
- name: Install LLVM+Clang
6627
if: startsWith(matrix.config.os, 'ubuntu-')
6728
run: |
@@ -89,15 +50,11 @@ jobs:
8950
chmod +x llvm.sh
9051
sudo ./llvm.sh ${{matrix.config.clang_version}} all
9152
sudo apt-get install libc++-dev libc++1 libc++abi-dev libc++abi1
92-
93-
9453
- name: Install GCC 14
9554
if: matrix.config.name == 'Ubuntu GCC 14'
9655
run: |
9756
sudo apt update
9857
sudo apt-get install g++-14
99-
100-
10158
- name: Configure
10259
run: |
10360
rm -rf .build
@@ -106,11 +63,9 @@ jobs:
10663
echo ${{ matrix.config.cmake_args }}
10764
echo ${{ matrix.config.toolchain }}
10865
cmake ${{ matrix.config.cmake_args }} -DCMAKE_TOOLCHAIN_FILE=etc/${{ matrix.config.toolchain }} -B . -S ..
109-
11066
- name: Build
11167
run: |
11268
cmake --build .build --config Asan --target all -- -k 0
113-
11469
- name: Test
11570
run: |
11671
cd .build

‎.markdownlint.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"MD013": false,
3+
"MD024": false
4+
}

‎.shellcheckrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# shellcheck
2+
# allow for non-alphanumeric filenames
3+
disable=SC2038

‎CMakeLists.txt‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
# cmake-format: off
12
# /CMakeLists.txt -*-makefile-*-
23
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
# cmake-format: on
35

46
cmake_minimum_required(VERSION 3.10)
57

6-
project(beman_optional26 VERSION 0.0.0 LANGUAGES CXX)
8+
project(
9+
beman_optional26
10+
VERSION 0.0.0
11+
LANGUAGES CXX)
712

813
enable_testing()
914

@@ -20,25 +25,21 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake)
2025
install(
2126
EXPORT ${TARGETS_EXPORT_NAME}
2227
NAMESPACE ${CMAKE_PROJECT_NAME}
23-
DESTINATION ${INSTALL_CONFIGDIR}
24-
)
28+
DESTINATION ${INSTALL_CONFIGDIR})
2529

2630
include(CMakePackageConfigHelpers)
2731

2832
write_basic_package_version_file(
29-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
30-
VERSION ${PROJECT_VERSION}
31-
COMPATIBILITY AnyNewerVersion
32-
)
33+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
34+
VERSION ${PROJECT_VERSION}
35+
COMPATIBILITY AnyNewerVersion)
3336

3437
configure_package_config_file(
35-
"cmake/Config.cmake.in"
36-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
37-
INSTALL_DESTINATION ${INSTALL_CONFIGDIR}
38-
)
39-
40-
install(FILES
41-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
42-
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
43-
DESTINATION ${INSTALL_CONFIGDIR}
44-
)
38+
"cmake/Config.cmake.in"
39+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
40+
INSTALL_DESTINATION ${INSTALL_CONFIGDIR})
41+
42+
install(
43+
FILES ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
44+
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake
45+
DESTINATION ${INSTALL_CONFIGDIR})

‎CMakePresets.json‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,33 @@
3131
"description": "Build with GCC 14 compilers",
3232
"toolchainFile": "${sourceDir}/etc/gcc-14-toolchain.cmake"
3333
},
34+
{
35+
"name": "gcc-13",
36+
"inherits": "common",
37+
"displayName": "GCC 13",
38+
"description": "Build with GCC 13 compilers",
39+
"toolchainFile": "${sourceDir}/etc/gcc-13-toolchain.cmake"
40+
},
41+
{
42+
"name": "clang-19",
43+
"inherits": "common",
44+
"displayName": "Clang 19",
45+
"description": "Build with Clang 19 compilers",
46+
"toolchainFile": "${sourceDir}/etc/clang-19-toolchain.cmake"
47+
},
3448
{
3549
"name": "clang-18",
3650
"inherits": "common",
3751
"displayName": "Clang 18",
3852
"description": "Build with Clang 18 compilers",
3953
"toolchainFile": "${sourceDir}/etc/clang-18-toolchain.cmake"
54+
},
55+
{
56+
"name": "clang-17",
57+
"inherits": "common",
58+
"displayName": "Clang 17",
59+
"description": "Build with Clang 17 compilers",
60+
"toolchainFile": "${sourceDir}/etc/clang-17-toolchain.cmake"
4061
}
4162
],
4263
"buildPresets": [
@@ -53,9 +74,21 @@
5374
"name": "gcc-14",
5475
"configurePreset": "gcc-14"
5576
},
77+
{
78+
"name": "gcc-13",
79+
"configurePreset": "gcc-13"
80+
},
81+
{
82+
"name": "clang-19",
83+
"configurePreset": "clang-19"
84+
},
5685
{
5786
"name": "clang-18",
5887
"configurePreset": "clang-18"
88+
},
89+
{
90+
"name": "clang-17",
91+
"configurePreset": "clang-17"
5992
}
6093
],
6194
"testPresets": [
@@ -80,10 +113,25 @@
80113
"inherits": "common",
81114
"configurePreset": "gcc-14"
82115
},
116+
{
117+
"name": "gcc-13",
118+
"inherits": "common",
119+
"configurePreset": "gcc-13"
120+
},
121+
{
122+
"name": "clang-19",
123+
"inherits": "common",
124+
"configurePreset": "clang-19"
125+
},
83126
{
84127
"name": "clang-18",
85128
"inherits": "common",
86129
"configurePreset": "clang-18"
130+
},
131+
{
132+
"name": "clang-17",
133+
"inherits": "common",
134+
"configurePreset": "clang-17"
87135
}
88136
],
89137
"workflowPresets": [
@@ -121,6 +169,40 @@
121169
}
122170
]
123171
},
172+
{
173+
"name": "gcc-13",
174+
"steps": [
175+
{
176+
"type": "configure",
177+
"name": "gcc-13"
178+
},
179+
{
180+
"type": "build",
181+
"name": "gcc-13"
182+
},
183+
{
184+
"type": "test",
185+
"name": "gcc-13"
186+
}
187+
]
188+
},
189+
{
190+
"name": "clang-19",
191+
"steps": [
192+
{
193+
"type": "configure",
194+
"name": "clang-19"
195+
},
196+
{
197+
"type": "build",
198+
"name": "clang-19"
199+
},
200+
{
201+
"type": "test",
202+
"name": "clang-19"
203+
}
204+
]
205+
},
124206
{
125207
"name": "clang-18",
126208
"steps": [
@@ -137,6 +219,23 @@
137219
"name": "clang-18"
138220
}
139221
]
222+
},
223+
{
224+
"name": "clang-17",
225+
"steps": [
226+
{
227+
"type": "configure",
228+
"name": "clang-17"
229+
},
230+
{
231+
"type": "build",
232+
"name": "clang-17"
233+
},
234+
{
235+
"type": "test",
236+
"name": "clang-17"
237+
}
238+
]
140239
}
141240
]
142241
}

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#! /usr/bin/make -f
2+
# cmake-format: off
23
# /Makefile -*-makefile-*-
34
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
5+
# cmake-format: on
46

57
INSTALL_PREFIX?=.install/
68
PROJECT?=$(shell basename $(CURDIR))

0 commit comments

Comments
 (0)