Skip to content

Commit 85853d5

Browse files
committed
ci: test the built images
1 parent d6950a3 commit 85853d5

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.github/workflows/CI.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
- name: Build
5656
run: |
5757
pnpm build
58-
pnpm build.docker_tests
58+
pnpm build.docker-ci
5959
6060
- name: Lint
6161
run: |
@@ -229,12 +229,12 @@ jobs:
229229
pnpm:
230230
- 8
231231
container:
232-
- { file: "./dev/docker/ci/ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-17" }
233-
- { file: "./dev/docker/ci/fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-17" }
234-
- { file: "./dev/docker/ci/arch-llvm.dockerfile", image: "setup-cpp-arch-llvm", tag: "base-17" }
235-
- { file: "./dev/docker/ci/ubuntu-mingw.dockerfile", image: "setup-cpp-ubuntu-mingw", tag: "22.04-13" }
236-
# - { file: "./dev/docker/ci/fedora-mingw.dockerfile", image: "setup-cpp-fedora-mingw", tag: "40-13" }
237-
# - { file: "./dev/docker/ci/arch-mingw.dockerfile", image: "setup-cpp-arch-mingw", tag: "base-13" }
232+
- { file: "ubuntu-llvm.dockerfile", image: "setup-cpp-ubuntu-llvm", tag: "22.04-17" }
233+
- { file: "fedora-llvm.dockerfile", image: "setup-cpp-fedora-llvm", tag: "40-17" }
234+
- { file: "arch-llvm.dockerfile", image: "setup-cpp-arch-llvm", tag: "base-17" }
235+
- { file: "ubuntu-mingw.dockerfile", image: "setup-cpp-ubuntu-mingw", tag: "22.04-13" }
236+
# - { file: "fedora-mingw.dockerfile", image: "setup-cpp-fedora-mingw", tag: "40-13" }
237+
# - { file: "arch-mingw.dockerfile", image: "setup-cpp-arch-mingw", tag: "base-13" }
238238
steps:
239239
- uses: actions/checkout@v4
240240
with:
@@ -256,10 +256,18 @@ jobs:
256256
uses: docker/build-push-action@v5
257257
with:
258258
context: .
259-
file: ${{ matrix.container.file }}
259+
file: ./dev/docker/ci/${{ matrix.container.file }}
260260
push: ${{ github.event_name != 'pull_request' }}
261261
tags: ${{ vars.DOCKERHUB_USERNAME }}/${{ matrix.container.image }}:${{ matrix.container.tag }}
262262

263+
- name: Test
264+
uses: docker/build-push-action@v5
265+
with:
266+
context: .
267+
file: ./dev/docker/examples/${{ matrix.container.file }}
268+
push: false
269+
tags: ${{ vars.DOCKERHUB_USERNAME }}/test-${{ matrix.container.image }}:${{ matrix.container.tag }}
270+
263271
Release:
264272
if: startsWith(github.ref, 'refs/tags/')
265273
needs: [Build, BuildExecutable, Test, Docker]

dev/docker/examples/arch.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#### Building (example)
2-
FROM setup-cpp-arch AS builder
2+
FROM setup-cpp-arch-llvm AS builder
33

44
COPY ./dev/cpp_vcpkg_project /home/app
55
WORKDIR /home/app

dev/docker/examples/fedora.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#### Building (example)
2-
FROM setup-cpp-fedora AS builder
2+
FROM setup-cpp-fedora-llvm AS builder
33

44
COPY ./dev/cpp_vcpkg_project /home/app
55
WORKDIR /home/app

dev/docker/examples/ubuntu.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#### Building (example)
2-
FROM setup-cpp-ubuntu AS builder
2+
FROM setup-cpp-ubuntu-llvm AS builder
33

44
COPY ./dev/cpp_vcpkg_project /home/app
55
WORKDIR /home/app

0 commit comments

Comments
 (0)