diff options
| -rw-r--r-- | .devcontainer/x86-64/devcontainer.json | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 6 | ||||
| -rw-r--r-- | .vscode/settings.json | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.devcontainer/x86-64/devcontainer.json b/.devcontainer/x86-64/devcontainer.json index f0059ac..00e33ad 100644 --- a/.devcontainer/x86-64/devcontainer.json +++ b/.devcontainer/x86-64/devcontainer.json @@ -1,11 +1,11 @@ { "name": "TeachOS on x86-64", - "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-3", + "image": "registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-4", "features": { "ghcr.io/devcontainers/features/git:1": {}, "ghcr.io/devcontainers/features/git-lfs:1": {}, "ghcr.io/devcontainers-extra/features/apt-packages:1": { - "packages": "clang-tidy-21,cmake,grub2-common,grub-pc,mtools,ninja-build,qemu-system-x86,ssh,xorriso" + "packages": "build-essential,clang-tidy,clangd,cmake,grub2-common,grub-pc,mtools,ninja-build,qemu-system-x86,ssh,xorriso" } }, "customizations": { diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b5d12f..05bba19 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,10 +6,10 @@ build: stage: build - image: registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-3 + image: registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-4 before_script: - apt update - - apt install -y clang-tidy-21 cmake grub2-common grub-pc mtools ninja-build xorriso + - apt install -y clang-tidy cmake grub2-common grub-pc mtools ninja-build xorriso script: - cmake --preset $PLATFORM - cmake --build --preset $PLATFORM-$TYPE @@ -24,7 +24,7 @@ build: bht: stage: build - image: registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-3 + image: registry.gitlab.ost.ch:45023/teachos/devcontainers/x86-64:15.2.0-4 before_script: - apt update - apt install -y build-essential cmake ninja-build lcov libcatch2-dev diff --git a/.vscode/settings.json b/.vscode/settings.json index a4f7aef..4271526 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,6 +3,7 @@ "cmake.options.statusBarVisibility": "visible", "cmake.ctest.testExplorerIntegrationEnabled": false, "cmake.copyCompileCommands": "${workspaceFolder}/build/compile_commands.json", + "clangd.path": "clangd", "clangd.arguments": [ "--compile-commands-dir=${workspaceFolder}/build", "--query-driver=**/x86_64-pc-elf-g++", |