Skip to content

Commit 25eaed8

Browse files
7bitcoder7bitcoder
committed
update ci
1 parent f51765b commit 25eaed8

File tree

4 files changed

+183
-154
lines changed

4 files changed

+183
-154
lines changed

‎.github/workflows/DevCI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [ ubuntu-22.04, macos-12, windows-2022 ]
18+
os: [ ubuntu-latest, macos-latest, windows-latest ]
1919
library_type: [ HeaderOnly, Static, Shared ]
20-
std: [ 17, 20 ]
20+
std: [ 17, 20, 23 ]
2121
build_type: [ Release ]
2222

2323
runs-on: ${{matrix.os}}

‎.github/workflows/Linux.yml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -16,98 +16,98 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
compiler:
19-
- { tool: gcc, ver: 7 }
20-
- { tool: gcc, ver: 8 }
21-
- { tool: gcc, ver: 9 }
22-
- { tool: gcc, ver: 10 }
23-
- { tool: gcc, ver: 11 }
24-
- { tool: gcc, ver: 12 }
25-
- { tool: gcc, ver: 13 }
26-
- { tool: gcc, ver: 14 }
27-
- { tool: clang, ver: 7 }
28-
- { tool: clang, ver: 8 }
29-
- { tool: clang, ver: 9 }
30-
- { tool: clang, ver: 10 }
31-
- { tool: clang, ver: 11 }
32-
- { tool: clang, ver: 12 }
33-
- { tool: clang, ver: 13 }
34-
- { tool: clang, ver: 14 }
35-
- { tool: clang, ver: 15 }
36-
- { tool: clang, ver: 16 }
37-
- { tool: clang, ver: 17 }
38-
- { tool: clang, ver: 18 }
19+
- { name: GCC, ver: 7 }
20+
- { name: GCC, ver: 8 }
21+
- { name: GCC, ver: 9 }
22+
- { name: GCC, ver: 10 }
23+
- { name: GCC, ver: 11 }
24+
- { name: GCC, ver: 12 }
25+
- { name: GCC, ver: 13 }
26+
- { name: GCC, ver: 14 }
27+
- { name: Clang, ver: 7 }
28+
- { name: Clang, ver: 8 }
29+
- { name: Clang, ver: 9 }
30+
- { name: Clang, ver: 10 }
31+
- { name: Clang, ver: 11 }
32+
- { name: Clang, ver: 12 }
33+
- { name: Clang, ver: 13 }
34+
- { name: Clang, ver: 14 }
35+
- { name: Clang, ver: 15 }
36+
- { name: Clang, ver: 16 }
37+
- { name: Clang, ver: 17 }
38+
- { name: Clang, ver: 18 }
3939
build_type: [ Release ]
4040
os: [ ubuntu-20.04, ubuntu-22.04, ubuntu-24.04 ]
4141
std: [ 17, 20, 23 ]
4242
library_type: [ Static ]
4343
include:
44-
- compiler: { tool: gcc }
44+
- compiler: { name: GCC }
4545
cxx: g++
4646
cc: gcc
47+
packages: 'gcc-{0} g++-{0}'
4748
generator: Ninja
48-
- compiler: { tool: clang }
49+
- compiler: { name: Clang }
4950
cxx: clang++
5051
cc: clang
52+
packages: 'clang-{0}'
5153
generator: Ninja
5254
exclude:
53-
- { os: ubuntu-20.04, compiler: { tool: gcc, ver: 11 } }
54-
- { os: ubuntu-20.04, compiler: { tool: gcc, ver: 12 } }
55-
- { os: ubuntu-20.04, compiler: { tool: gcc, ver: 13 } }
56-
- { os: ubuntu-20.04, compiler: { tool: gcc, ver: 14 } }
57-
- { os: ubuntu-20.04, compiler: { tool: clang, ver: 13 } }
58-
- { os: ubuntu-20.04, compiler: { tool: clang, ver: 14 } }
59-
- { os: ubuntu-20.04, compiler: { tool: clang, ver: 15 } }
60-
- { os: ubuntu-20.04, compiler: { tool: clang, ver: 16 } }
61-
- { os: ubuntu-20.04, compiler: { tool: clang, ver: 17 } }
62-
- { os: ubuntu-20.04, compiler: { tool: clang, ver: 18 } }
63-
- { os: ubuntu-22.04, compiler: { tool: gcc, ver: 7 } }
64-
- { os: ubuntu-22.04, compiler: { tool: gcc, ver: 8 } }
65-
- { os: ubuntu-22.04, compiler: { tool: gcc, ver: 13 } }
66-
- { os: ubuntu-22.04, compiler: { tool: gcc, ver: 14 } }
67-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 7 } }
68-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 8 } }
69-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 9 } }
70-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 10 } }
71-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 16 } }
72-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 17 } }
73-
- { os: ubuntu-22.04, compiler: { tool: clang, ver: 18 } }
74-
- { os: ubuntu-24.04, compiler: { tool: gcc, ver: 7 } }
75-
- { os: ubuntu-24.04, compiler: { tool: gcc, ver: 8 } }
76-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 7 } }
77-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 8 } }
78-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 9 } }
79-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 10 } }
80-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 11 } }
81-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 12 } }
82-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 13 } }
83-
- { compiler: { tool: gcc, ver: 7 }, std: 20 }
84-
- { compiler: { tool: gcc, ver: 7 }, std: 23 }
85-
- { compiler: { tool: gcc, ver: 8 }, std: 23 }
86-
- { compiler: { tool: gcc, ver: 9 }, std: 23 }
87-
- { compiler: { tool: gcc, ver: 10 }, std: 23 }
88-
- { compiler: { tool: clang, ver: 7 }, std: 20 }
89-
- { compiler: { tool: clang, ver: 7 }, std: 23 }
90-
- { compiler: { tool: clang, ver: 8 }, std: 20 }
91-
- { compiler: { tool: clang, ver: 8 }, std: 23 }
92-
- { compiler: { tool: clang, ver: 9 }, std: 23 }
93-
- { compiler: { tool: clang, ver: 10 }, std: 23 }
94-
- { compiler: { tool: clang, ver: 11 }, std: 23 }
95-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 14 }, std: 20 } # gtest broken for now
96-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 14 }, std: 23 } # gtest broken for now
97-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 15 }, std: 20 } # gtest broken for now
98-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 15 }, std: 23 } # gtest broken for now
99-
- { os: ubuntu-24.04, compiler: { tool: clang, ver: 17 }, std: 23 } # gtest broken for now
55+
- { os: ubuntu-20.04, compiler: { name: GCC, ver: 11 } }
56+
- { os: ubuntu-20.04, compiler: { name: GCC, ver: 12 } }
57+
- { os: ubuntu-20.04, compiler: { name: GCC, ver: 13 } }
58+
- { os: ubuntu-20.04, compiler: { name: GCC, ver: 14 } }
59+
- { os: ubuntu-20.04, compiler: { name: Clang, ver: 13 } }
60+
- { os: ubuntu-20.04, compiler: { name: Clang, ver: 14 } }
61+
- { os: ubuntu-20.04, compiler: { name: Clang, ver: 15 } }
62+
- { os: ubuntu-20.04, compiler: { name: Clang, ver: 16 } }
63+
- { os: ubuntu-20.04, compiler: { name: Clang, ver: 17 } }
64+
- { os: ubuntu-20.04, compiler: { name: Clang, ver: 18 } }
65+
- { os: ubuntu-22.04, compiler: { name: GCC, ver: 7 } }
66+
- { os: ubuntu-22.04, compiler: { name: GCC, ver: 8 } }
67+
- { os: ubuntu-22.04, compiler: { name: GCC, ver: 13 } }
68+
- { os: ubuntu-22.04, compiler: { name: GCC, ver: 14 } }
69+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 7 } }
70+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 8 } }
71+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 9 } }
72+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 10 } }
73+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 16 } }
74+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 17 } }
75+
- { os: ubuntu-22.04, compiler: { name: Clang, ver: 18 } }
76+
- { os: ubuntu-24.04, compiler: { name: GCC, ver: 7 } }
77+
- { os: ubuntu-24.04, compiler: { name: GCC, ver: 8 } }
78+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 7 } }
79+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 8 } }
80+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 9 } }
81+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 10 } }
82+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 11 } }
83+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 12 } }
84+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 13 } }
85+
- { compiler: { name: GCC, ver: 7 }, std: 20 }
86+
- { compiler: { name: GCC, ver: 7 }, std: 23 }
87+
- { compiler: { name: GCC, ver: 8 }, std: 23 }
88+
- { compiler: { name: GCC, ver: 9 }, std: 23 }
89+
- { compiler: { name: GCC, ver: 10 }, std: 23 }
90+
- { compiler: { name: Clang, ver: 7 }, std: 20 }
91+
- { compiler: { name: Clang, ver: 7 }, std: 23 }
92+
- { compiler: { name: Clang, ver: 8 }, std: 20 }
93+
- { compiler: { name: Clang, ver: 8 }, std: 23 }
94+
- { compiler: { name: Clang, ver: 9 }, std: 23 }
95+
- { compiler: { name: Clang, ver: 10 }, std: 23 }
96+
- { compiler: { name: Clang, ver: 11 }, std: 23 }
97+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 14 }, std: 20 } # gtest broken for now
98+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 14 }, std: 23 } # gtest broken for now
99+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 15 }, std: 20 } # gtest broken for now
100+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 15 }, std: 23 } # gtest broken for now
101+
- { os: ubuntu-24.04, compiler: { name: Clang, ver: 17 }, std: 23 } # gtest broken for now
100102

101103
runs-on: ${{matrix.os}}
102104
steps:
103105
- uses: actions/checkout@v4
104106

105107
- name: Create Build Environment
106-
env:
107-
PACKAGES: ${{ matrix.compiler.tool == 'gcc' && format('gcc-{0} g++-{0}', matrix.compiler.ver) || format('{0}-{1}', matrix.compiler.tool, matrix.compiler.ver) }}
108108
run: |
109109
sudo apt update
110-
sudo apt install ${{env.PACKAGES}} ninja-build -y
110+
sudo apt install ${{format(matrix.packages, matrix.compiler.ver)}} ninja-build -y
111111
sudo apt install locales-all
112112
cmake -E make_directory ${{runner.workspace}}/build
113113

‎.github/workflows/MacOs.yml

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
name: MacOs
22

33
on:
4-
push:
5-
branches: [ "dev" ]
6-
paths-ignore:
7-
- "Docs/**"
8-
- ".readthedocs.yaml"
9-
- "README.md"
104
pull_request:
11-
branches: [ "main" ]
5+
branches: [ 'main' ]
126
paths-ignore:
13-
- "Docs/**"
14-
- ".readthedocs.yaml"
15-
- "README.md"
7+
- 'Docs/**'
8+
- '.readthedocs.yaml'
9+
- 'README.md'
1610

1711
jobs:
1812
test:
@@ -22,62 +16,67 @@ jobs:
2216
fail-fast: false
2317
matrix:
2418
compiler: [
25-
{ tool: apple-clang },
26-
{ tool: llvm, ver: 12 },
27-
{ tool: llvm, ver: 13 },
28-
{ tool: llvm, ver: 14 },
29-
{ tool: llvm, ver: 15 },
30-
{ tool: llvm, ver: 16 },
31-
{ tool: llvm, ver: 17 },
32-
{ tool: llvm, ver: 18 },
33-
{ tool: gcc, ver: 10 },
34-
{ tool: gcc, ver: 11 },
35-
{ tool: gcc, ver: 12 },
36-
{ tool: gcc, ver: 13 },
37-
{ tool: gcc, ver: 14 } ]
19+
{ name: 'Apple Clang' },
20+
{ name: Clang, ver: 12 },
21+
{ name: Clang, ver: 13 },
22+
{ name: Clang, ver: 14 },
23+
{ name: Clang, ver: 15 },
24+
{ name: Clang, ver: 16 },
25+
{ name: Clang, ver: 17 },
26+
{ name: Clang, ver: 18 },
27+
{ name: GCC, ver: 10 },
28+
{ name: GCC, ver: 11 },
29+
{ name: GCC, ver: 12 },
30+
{ name: GCC, ver: 13 },
31+
{ name: GCC, ver: 14 } ]
3832
build_type: [ Release ]
3933
os: [ macos-12, macos-13, macos-14 ]
4034
std: [ 17, 20, 23 ]
4135
library_type: [ Static ]
4236
include:
43-
- compiler: { tool: gcc }
44-
cxx: g++
45-
cc: gcc
46-
- compiler: { tool: llvm }
47-
cxx: clang++
48-
cc: clang
49-
- compiler: { tool: apple-clang }
37+
- compiler: { name: 'Apple Clang' }
5038
cxx: ''
5139
cc: ''
40+
generator: Ninja
41+
- compiler: { name: Clang }
42+
cxx: clang++
43+
cc: clang
44+
package: llvm,
45+
generator: Ninja
46+
- compiler: { name: GCC }
47+
cxx: 'g++-{0}'
48+
cc: 'g++-{0}'
49+
package: gcc,
50+
generator: Ninja
5251
exclude:
53-
- { os: macos-12, compiler: { tool: gcc, ver: 13 } }
54-
- { os: macos-13, compiler: { tool: gcc, ver: 10 } }
55-
- { os: macos-13, compiler: { tool: gcc, ver: 11 } }
56-
- { os: macos-13, compiler: { tool: gcc, ver: 13 } }
57-
- { os: macos-14, compiler: { tool: gcc, ver: 10 } }
58-
- { compiler: { tool: gcc, ver: 10 }, std: 23 }
52+
- { os: macos-12, compiler: { name: GCC, ver: 13 } }
53+
- { os: macos-13, compiler: { name: GCC, ver: 10 } }
54+
- { os: macos-13, compiler: { name: GCC, ver: 11 } }
55+
- { os: macos-13, compiler: { name: GCC, ver: 13 } }
56+
- { os: macos-14, compiler: { name: GCC, ver: 10 } }
57+
- { compiler: { name: GCC, ver: 10 }, std: 23 }
5958

6059
runs-on: ${{matrix.os}}
6160
steps:
6261
- uses: actions/checkout@v4
6362

6463
- name: Create Build Environment
65-
if: matrix.compiler.tool != 'apple-clang'
64+
if: matrix.compiler.name != 'Apple Clang'
6665
run: |
6766
brew update &&
68-
brew install ${{matrix.compiler.tool}}@${{matrix.compiler.ver}} ninja
67+
brew install ${{matrix.package}}@${{matrix.compiler.ver}} ninja
6968
cmake -E make_directory ${{runner.workspace}}/build
7069
7170
- name: Try Setup LLVM Environment
72-
if: matrix.compiler.tool == 'llvm'
71+
if: matrix.compiler.name == 'Clang'
7372
run: |
7473
echo "PATH=$(brew --prefix llvm@${{matrix.compiler.ver}})/bin:${PATH}" >> $GITHUB_ENV
7574
7675
- name: Configure
7776
env:
78-
CXX: "${{ matrix.compiler.tool == 'gcc' && format('{0}-{1}', matrix.cxx, matrix.compiler.ver) || matrix.cxx }}"
79-
CC: "${{ matrix.compiler.tool == 'gcc' && format('{0}-{1}', matrix.cc, matrix.compiler.ver) || matrix.cc }}"
80-
run: cmake -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
77+
CXX: ${{format(matrix.cxx, matrix.compiler.ver)}}
78+
CC: ${{format(matrix.cc, matrix.compiler.ver)}}
79+
run: cmake -B ${{runner.workspace}}/build -G ${{matrix.generator}} -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DCMAKE_CXX_STANDARD=${{matrix.std}} -D_7BIT_DI_LIBRARY_TYPE=${{matrix.library_type}} -D_7BIT_DI_BUILD_ALL_TESTS=ON
8180

8281
- name: Build
8382
run: cmake --build ${{runner.workspace}}/build --config ${{matrix.build_type}} -j

0 commit comments

Comments
 (0)