Skip to content

Commit 0713893

Browse files
foonathanfoonathan
committed
Update CI to use my docker containers
1 parent b1fd38a commit 0713893

File tree

2 files changed

+57
-55
lines changed

2 files changed

+57
-55
lines changed

‎.github/workflows/feature_ci.yml‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,42 @@ name: Feature CI
22

33
on:
44
push:
5-
branches-ignore: ['main']
5+
branches-ignore: ['main', 'fix/*']
66
pull_request:
77

88
jobs:
99
linux:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
image:
14-
# List: https://github.com/conan-io/conan-docker-tools
15-
- gcc10
16-
- gcc5
17-
- clang10
18-
- clang40
19-
sharedlibs: [OFF, ON]
13+
image: ["gcc:7", "gcc:14", "clang:6", "clang:18"]
2014

2115
runs-on: ubuntu-latest
2216
container:
23-
image: conanio/${{matrix.image}}
24-
options: --user root
17+
image: ghcr.io/foonathan/${{matrix.image}}
2518

2619
steps:
27-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2821
- name: Create Build Environment
2922
run: cmake -E make_directory build
3023

3124
- name: Configure
3225
working-directory: build/
33-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=${{matrix.sharedlibs}}
26+
run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug
3427
- name: Build
3528
working-directory: build/
36-
run: cmake --build . --config Debug
29+
run: cmake --build .
3730
- name: Test
3831
working-directory: build/
39-
run: ctest -C Debug --output-on-failure
32+
run: ctest --output-on-failure
4033

4134
macos:
4235
strategy:
4336
fail-fast: false
4437
matrix:
45-
xcode: ['11', '13']
46-
sharedlibs: [OFF, ON]
38+
xcode: ['15', '16']
4739

48-
runs-on: macos-11
40+
runs-on: macos-14
4941

5042
steps:
5143
- uses: actions/checkout@v2
@@ -54,10 +46,12 @@ jobs:
5446
xcode-version: ${{matrix.xcode}}
5547
- name: Create Build Environment
5648
run: cmake -E make_directory build
49+
- name: Install ninja
50+
run: brew install ninja
5751

5852
- name: Configure
5953
working-directory: build/
60-
run: cmake $GITHUB_WORKSPACE -DBUILD_SHARED_LIBS=${{matrix.sharedlibs}}
54+
run: cmake -GNinja $GITHUB_WORKSPACE
6155
- name: Build
6256
working-directory: build/
6357
run: cmake --build .
@@ -69,21 +63,22 @@ jobs:
6963
strategy:
7064
fail-fast: false
7165
matrix:
72-
sharedlibs: [OFF, ON]
66+
arch: [Win32, x64]
7367

74-
runs-on: windows-2019
68+
runs-on: windows-2022
7569

7670
steps:
7771
- uses: actions/checkout@v2
7872
- name: Create Build Environment
7973
run: cmake -E make_directory build
74+
8075
- name: Configure
8176
shell: bash
8277
working-directory: build/
83-
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 16 2019" -DBUILD_SHARED_LIBS=${{matrix.sharedlibs}}
78+
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 17 2022" -A ${{matrix.arch}}
8479
- name: Build
8580
working-directory: build/
86-
run: cmake --build . --config Debug
81+
run: cmake --build . --config Debug -j 2
8782
- name: Test
8883
working-directory: build/
8984
run: ctest -C Debug --output-on-failure

‎.github/workflows/main_ci.yml‎

Lines changed: 40 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,64 @@ name: Main CI
22

33
on:
44
push:
5-
branches: [main]
5+
branches: [main, fix/*]
66

77
jobs:
88
linux:
99
strategy:
1010
fail-fast: false
1111
matrix:
1212
image:
13-
# List: https://github.com/conan-io/conan-docker-tools
14-
- gcc10
15-
- gcc9
16-
- gcc8
17-
- gcc7
18-
- gcc6
19-
- gcc5
20-
- clang10
21-
- clang9
22-
- clang8
23-
- clang7
24-
- clang60
25-
- clang50
26-
- clang40
13+
- "gcc:7"
14+
- "gcc:8"
15+
- "gcc:9"
16+
- "gcc:10"
17+
- "gcc:11"
18+
- "gcc:12"
19+
- "gcc:13"
20+
- "gcc:14"
21+
- "clang:6"
22+
- "clang:7"
23+
- "clang:8"
24+
- "clang:9"
25+
- "clang:10"
26+
- "clang:11"
27+
- "clang:12"
28+
- "clang:13"
29+
- "clang:14"
30+
- "clang:15"
31+
- "clang:16"
32+
- "clang:17"
33+
- "clang:18"
2734
build_type: [Debug, Release]
28-
sharedlibs: [OFF, ON]
2935

3036
runs-on: ubuntu-latest
3137
container:
32-
image: conanio/${{matrix.image}}
33-
options: --user root
38+
image: ghcr.io/foonathan/${{matrix.image}}
3439

3540
steps:
36-
- uses: actions/checkout@v2
41+
- uses: actions/checkout@v4
3742
- name: Create Build Environment
3843
run: cmake -E make_directory build
44+
3945
- name: Configure
4046
working-directory: build/
41-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}} -DBUILD_SHARED_LIBS=${{matrix.sharedlibs}}
47+
run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
4248
- name: Build
4349
working-directory: build/
44-
run: cmake --build . --config ${{matrix.build_type}}
50+
run: cmake --build .
4551
- name: Test
4652
working-directory: build/
47-
run: ctest -C ${{matrix.build_type}} --output-on-failure
53+
run: ctest --output-on-failure
4854

4955
macos:
5056
strategy:
5157
fail-fast: false
5258
matrix:
53-
xcode:
54-
- '11'
55-
- '12'
56-
- '13'
57-
sharedlibs: [OFF, ON]
59+
xcode: ['15', '16']
60+
build_type: [Debug, Release]
5861

59-
runs-on: macos-11
62+
runs-on: macos-14
6063

6164
steps:
6265
- uses: actions/checkout@v2
@@ -65,9 +68,12 @@ jobs:
6568
xcode-version: ${{matrix.xcode}}
6669
- name: Create Build Environment
6770
run: cmake -E make_directory build
71+
- name: Install ninja
72+
run: brew install ninja
73+
6874
- name: Configure
6975
working-directory: build/
70-
run: cmake $GITHUB_WORKSPACE -DBUILD_SHARED_LIBS=${{matrix.sharedlibs}}
76+
run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
7177
- name: Build
7278
working-directory: build/
7379
run: cmake --build .
@@ -79,23 +85,24 @@ jobs:
7985
strategy:
8086
fail-fast: false
8187
matrix:
88+
toolset: ['v142', 'v143', 'ClangCL']
8289
build_type: [Debug, Release]
83-
sharedlibs: [OFF, ON]
84-
std: [14, 17, 20]
90+
arch: [Win32, x64]
8591

8692
runs-on: windows-2022
8793

8894
steps:
8995
- uses: actions/checkout@v2
9096
- name: Create Build Environment
9197
run: cmake -E make_directory build
98+
9299
- name: Configure
93100
shell: bash
94101
working-directory: build/
95-
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 17 2022" -DCMAKE_CXX_STANDARD=${{matrix.std}} -DBUILD_SHARED_LIBS=${{matrix.sharedlibs}}
102+
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 17 2022" -T ${{matrix.toolset}} -A ${{matrix.arch}}
96103
- name: Build
97104
working-directory: build/
98-
run: cmake --build . --config ${{matrix.build_type}}
105+
run: cmake --build . --config ${{matrix.build_type}} -j 2
99106
- name: Test
100107
working-directory: build/
101108
run: ctest -C ${{matrix.build_type}} --output-on-failure

0 commit comments

Comments
 (0)