Skip to content

Commit e675be7

Browse files
authored
build(ci): migrate CI from Docker image to devcontainers/ci (#196)
Replace addnab/docker-run-action with devcontainers/ci@v0.3 to use the project's .devcontainer/Dockerfile (GCC 14) instead of the outdated ptrnull233/simple_kernel:latest image (GCC 13). Fixes build failures caused by C++23 deducing-this requiring GCC 14+. Signed-off-by: Niu Zhihong <zhihong@nzhnb.com>
1 parent d4def7e commit e675be7

1 file changed

Lines changed: 6 additions & 21 deletions

File tree

.github/workflows/workflow.yml

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ on:
77
- pull_request
88
- release
99

10-
env:
11-
CMAKE_BUILD_TYPE: Release
12-
DOCKER_IMAGE: ptrnull233/simple_kernel:latest
13-
1410
jobs:
1511
build:
1612
runs-on: ubuntu-latest
@@ -26,29 +22,23 @@ jobs:
2622
submodules: recursive
2723

2824
- name: x86_64
29-
uses: addnab/docker-run-action@v3
25+
uses: devcontainers/ci@v0.3
3026
with:
31-
image: ${{ env.DOCKER_IMAGE }}
32-
options: -v ${{ github.workspace }}:/root -e CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }}
33-
run: |
27+
runCmd: |
3428
cmake --preset=build_x86_64
3529
cmake --build build_x86_64 --target SimpleKernel unit-test coverage docs
3630
3731
- name: riscv64
38-
uses: addnab/docker-run-action@v3
32+
uses: devcontainers/ci@v0.3
3933
with:
40-
image: ${{ env.DOCKER_IMAGE }}
41-
options: -v ${{ github.workspace }}:/root -e CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }}
42-
run: |
34+
runCmd: |
4335
cmake --preset=build_riscv64
4436
cmake --build build_riscv64 --target SimpleKernel
4537
4638
- name: aarch64
47-
uses: addnab/docker-run-action@v3
39+
uses: devcontainers/ci@v0.3
4840
with:
49-
image: ${{ env.DOCKER_IMAGE }}
50-
options: -v ${{ github.workspace }}:/root -e CMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }}
51-
run: |
41+
runCmd: |
5242
cmake --preset=build_aarch64
5343
cmake --build build_aarch64 --target SimpleKernel
5444
@@ -64,8 +54,3 @@ jobs:
6454
with:
6555
github_token: ${{ secrets.GITHUB_TOKEN }}
6656
publish_dir: ${{ github.workspace }}/docs/html
67-
68-
# - name: Super-Linter
69-
# uses: super-linter/super-linter@v7.2.0
70-
# env:
71-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)