Skip to content

Commit 3d02be0

Browse files
committed
Clean up CI
1 parent a3ff62b commit 3d02be0

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

.github/workflows/core-tests.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,27 @@ jobs:
3737
os:
3838
- "12"
3939
- "13"
40-
name: Debian ${{ matrix.os }}
40+
name: Debian ${{ matrix.os }} (x86_64)
4141
runs-on: ubuntu-24.04
42+
container:
43+
image: debian:${{ matrix.os }}
4244
steps:
4345
- name: Checkout repository
4446
uses: actions/checkout@v6
45-
- name: Set up Docker
46-
uses: docker/setup-buildx-action@v3
47-
- name: Run Debian container
47+
48+
- name: Install apt packages
4849
run: |
49-
docker run --rm -v $(pwd):/workspace -w /workspace debian:${{ matrix.os }}-slim /bin/bash -c "
50-
set -eou pipefail
51-
export GITHUB_ACTIONS=true
5250
apt-get update -y --fix-missing
5351
apt-get install -y build-essential libgtest-dev libgmock-dev ninja-build cmake
54-
cmake -G Ninja -S. -B build -DLIBCAPT_SANITIZE=ON -DLIBCAPT_BUILD_EXAMPLES=ON -DLIBCAPT_BUILD_TESTS=ON -DCMAKE_CXX_FLAGS="-Werror"
55-
cmake --build build -v -j
56-
ctest --test-dir build --output-on-failure -j
57-
"
52+
53+
- name: Configure
54+
run: cmake -G Ninja -S. -B build -DLIBCAPT_SANITIZE=ON -DLIBCAPT_BUILD_EXAMPLES=ON -DLIBCAPT_BUILD_TESTS=ON -DCMAKE_CXX_FLAGS="-Werror"
55+
56+
- name: Compile
57+
run: cmake --build build -v -j
58+
59+
- name: Run tests
60+
run: ctest --test-dir build --output-on-failure -j
5861

5962
FreeBSD:
6063
needs: Ubuntu
@@ -67,7 +70,7 @@ jobs:
6770
run:
6871
shell: freebsd {0}
6972
name: FreeBSD ${{ matrix.release }}-RELEASE
70-
runs-on: ubuntu-latest
73+
runs-on: ubuntu-24.04
7174
steps:
7275
- name: Checkout repository
7376
uses: actions/checkout@v6
@@ -99,7 +102,7 @@ jobs:
99102
run:
100103
shell: openbsd {0}
101104
name: OpenBSD ${{ matrix.release }}
102-
runs-on: ubuntu-latest
105+
runs-on: ubuntu-24.04
103106
steps:
104107
- name: Checkout repository
105108
uses: actions/checkout@v6

0 commit comments

Comments
 (0)