Skip to content

Commit 95d08d7

Browse files
committed
use testing container
1 parent 00c10c3 commit 95d08d7

File tree

1 file changed

+14
-30
lines changed

1 file changed

+14
-30
lines changed

.github/workflows/ci_tests.yml

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
presets:
19-
- preset: "gcc-debug"
20-
platform: "ubuntu-latest"
21-
- preset: "gcc-release"
22-
platform: "ubuntu-latest"
23-
name: "Preset: ${{ matrix.presets.preset }} on ${{ matrix.presets.platform }}"
24-
runs-on: ${{ matrix.presets.platform }}
19+
- preset: gcc-debug
20+
tag: gnu-14
21+
- preset: gcc-release
22+
platform: llvm-20
23+
name: "Preset: ${{ matrix.presets.preset }}"
24+
container:
25+
image: ghcr.io/bemanproject/infra:test-${{ matrix.presets.tag }}
2526
steps:
2627
- uses: actions/checkout@v4
2728
- name: Setup build environment
@@ -41,12 +42,13 @@ jobs:
4142
strategy:
4243
fail-fast: false
4344
matrix:
44-
platform: [ubuntu-24.04]
4545
compiler:
4646
- cpp: g++
4747
c: gcc
48+
tag: gnu-14
4849
- cpp: clang++
4950
c: clang
51+
tag: llvm-20
5052
cpp_version: [20, 23]
5153
cmake_args:
5254
- description: "Default"
@@ -60,42 +62,24 @@ jobs:
6062
compiler:
6163
cpp: g++
6264
c: gcc
65+
tag: gnu-14
6366
cpp_version: 20
6467
cmake_args:
6568
description: "Dynamic"
6669
cmake_args: "-DBUILD_SHARED_LIBS=on"
6770

6871
name: "Build & Test: ${{ matrix.compiler.c }} ${{ matrix.cpp_version }} ${{ matrix.cmake_args.description }}"
69-
runs-on: ${{ matrix.platform }}
72+
container:
73+
image: ghcr.io/bemanproject/infra:test-${{ matrix.compiler.tag }}
7074
steps:
7175
- uses: actions/checkout@v4
72-
- name: Install Ninja
73-
uses: lukka/get-cmake@latest
74-
with:
75-
cmakeVersion: "~3.25.0"
76-
ninjaVersion: "^1.11.1"
77-
- name: Install latest compiler
78-
run: |
79-
if [ "${{ matrix.compiler.cpp}}" == "g++" ]; then
80-
# Install gcc-14
81-
sudo apt-get update
82-
sudo apt-get install -y gcc-14 g++-14
83-
84-
sudo rm /usr/bin/gcc
85-
sudo ln -s /usr/bin/gcc-14 /usr/bin/gcc
86-
87-
sudo rm /usr/bin/g++
88-
sudo ln -s /usr/bin/g++-14 /usr/bin/g++
89-
else
90-
# Install llvm
91-
sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
92-
fi
9376
- name: Print installed software
9477
run: |
9578
clang++ --version
9679
g++ --version
9780
cmake --version
9881
ninja --version
82+
ctest --version
9983
- name: Configure CMake
10084
run: |
10185
cmake -B build -S . -DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }} ${{ matrix.cmake_args.args }}
@@ -141,7 +125,7 @@ jobs:
141125
- class: llvm
142126
version: 17
143127
container:
144-
image: ghcr.io/wusatosi/cpp-docker:${{ matrix.compilers.class }}-${{ matrix.compilers.version }}
128+
image: ghcr.io/bemanproject/infra:test-${{ matrix.compilers.class }}-${{ matrix.compilers.version }}
145129
name: "Compiler: ${{ matrix.compilers.class }} ${{ matrix.compilers.version }}"
146130
steps:
147131
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)