Skip to content

Commit c1ae83a

Browse files
foonathanfoonathan
committed
Use my docker containers for CI
1 parent cdf334c commit c1ae83a

2 files changed

Lines changed: 67 additions & 54 deletions

File tree

‎.github/workflows/feature_ci.yml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,60 +2,56 @@ 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-
- gcc49
17-
- clang10
18-
- clang40
13+
image: ["gcc:7", "gcc:14", "clang:6", "clang:18"]
1914

2015
runs-on: ubuntu-latest
2116
container:
22-
image: conanio/${{matrix.image}}
23-
options: --user root
17+
image: ghcr.io/foonathan/${{matrix.image}}
2418

2519
steps:
26-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2721
- name: Create Build Environment
2822
run: cmake -E make_directory build
2923

3024
- name: Configure
3125
working-directory: build/
32-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug
26+
run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=Debug
3327
- name: Build
3428
working-directory: build/
35-
run: cmake --build . --config Debug
29+
run: cmake --build .
3630
- name: Test
3731
working-directory: build/
38-
run: ctest -C Debug --output-on-failure
32+
run: ctest --output-on-failure
3933

4034
macos:
4135
strategy:
4236
fail-fast: false
4337
matrix:
44-
xcode: ['11', '13']
38+
xcode: ['15', '16']
4539

46-
runs-on: macos-11
40+
runs-on: macos-14
4741

4842
steps:
49-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v4
5044
- uses: maxim-lobanov/setup-xcode@v1
5145
with:
5246
xcode-version: ${{matrix.xcode}}
5347
- name: Create Build Environment
5448
run: cmake -E make_directory build
49+
- name: Install ninja
50+
run: brew install ninja
5551

5652
- name: Configure
5753
working-directory: build/
58-
run: cmake $GITHUB_WORKSPACE
54+
run: cmake -GNinja $GITHUB_WORKSPACE
5955
- name: Build
6056
working-directory: build/
6157
run: cmake --build .
@@ -64,17 +60,22 @@ jobs:
6460
run: ctest --output-on-failure
6561

6662
windows:
67-
runs-on: windows-2019
63+
strategy:
64+
fail-fast: false
65+
matrix:
66+
arch: [Win32, x64]
67+
68+
runs-on: windows-2022
6869

6970
steps:
70-
- uses: actions/checkout@v2
71+
- uses: actions/checkout@v4
7172
- name: Create Build Environment
7273
run: cmake -E make_directory build
7374

7475
- name: Configure
7576
shell: bash
7677
working-directory: build/
77-
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 16 2019"
78+
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 17 2022" -A ${{matrix.arch}}
7879
- name: Build
7980
working-directory: build/
8081
run: cmake --build . --config Debug -j 2

‎.github/workflows/main_ci.yml‎

Lines changed: 46 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,73 +2,78 @@ 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-
- gcc49
21-
- clang10
22-
- clang9
23-
- clang8
24-
- clang7
25-
- clang60
26-
- clang50
27-
- 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"
2834
build_type: [Debug, Release]
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
3944

4045
- name: Configure
4146
working-directory: build/
42-
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
47+
run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
4348
- name: Build
4449
working-directory: build/
45-
run: cmake --build . --config ${{matrix.build_type}}
50+
run: cmake --build .
4651
- name: Test
4752
working-directory: build/
48-
run: ctest -C ${{matrix.build_type}} --output-on-failure
53+
run: ctest --output-on-failure
4954

5055
macos:
5156
strategy:
5257
fail-fast: false
5358
matrix:
54-
xcode:
55-
- '11'
56-
- '12'
57-
- '13'
59+
xcode: ['15', '16']
60+
build_type: [Debug, Release]
5861

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

6164
steps:
62-
- uses: actions/checkout@v2
65+
- uses: actions/checkout@v4
6366
- uses: maxim-lobanov/setup-xcode@v1
6467
with:
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
6873

6974
- name: Configure
7075
working-directory: build/
71-
run: cmake $GITHUB_WORKSPACE
76+
run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
7277
- name: Build
7378
working-directory: build/
7479
run: cmake --build .
@@ -77,21 +82,28 @@ jobs:
7782
run: ctest --output-on-failure
7883

7984
windows:
80-
runs-on: windows-2019
85+
strategy:
86+
fail-fast: false
87+
matrix:
88+
toolset: ['v142', 'v143', 'ClangCL']
89+
build_type: [Debug, Release]
90+
arch: [Win32, x64]
91+
92+
runs-on: windows-2022
8193

8294
steps:
83-
- uses: actions/checkout@v2
95+
- uses: actions/checkout@v4
8496
- name: Create Build Environment
8597
run: cmake -E make_directory build
8698

8799
- name: Configure
88100
shell: bash
89101
working-directory: build/
90-
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 16 2019"
102+
run: cmake $GITHUB_WORKSPACE -G"Visual Studio 17 2022" -T ${{matrix.toolset}} -A ${{matrix.arch}}
91103
- name: Build
92104
working-directory: build/
93-
run: cmake --build . --config Debug -j 2
105+
run: cmake --build . --config ${{matrix.build_type}} -j 2
94106
- name: Test
95107
working-directory: build/
96-
run: ctest -C Debug --output-on-failure
108+
run: ctest -C ${{matrix.build_type}} --output-on-failure
97109

0 commit comments

Comments
 (0)