Skip to content

Commit 0ef219f

Browse files
authored
Merge branch 'main' into fix-setting-of-use-bazel-version-when-different-bazel-version-is-used
2 parents bb50ddc + 24b2140 commit 0ef219f

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/s-core-devcontainer/.devcontainer/devcontainer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"ms-python.python",
4949
"charliermarsh.ruff",
5050
"mads-hartmann.bash-ide-vscode",
51+
"matepek.vscode-catch2-test-adapter",
5152
"bazelbuild.vscode-bazel", // Bazel support for Visual Studio Code; see also bazel.lsp.command below
5253
"dbaeumer.vscode-eslint",
5354
"EditorConfig.EditorConfig",
@@ -80,6 +81,9 @@
8081
"--experimental_enable_label_completions"
8182
],
8283
"C_Cpp.intelliSenseEngine": "disabled",
84+
// This only supports basic tests: https://github.com/matepek/vscode-catch2-test-adapter/issues/429
85+
// More complex tests may need execution via bazel, which is not done yet.
86+
"testMate.cpp.test.executables": "bazel-bin/**/*{test,Test,TEST}*",
8387
"tasks": {
8488
"version": "2.0.0",
8589
"tasks": [

src/s-core-devcontainer/.devcontainer/s-core-local/install.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ apt-get install -y --no-install-recommends --fix-broken qemu-system-arm="${qemu_
105105
# sshpass
106106
apt-get install -y sshpass="${sshpass_version}*"
107107

108+
# Bash completion for rust tooling
109+
rustup completions bash rustup >> /etc/bash_completion.d/rustup.bash
110+
rustup completions bash cargo >> /etc/bash_completion.d/cargo.bash
111+
108112
# Cleanup
109113
# REMOVE CONTAINER BUILD DEPENDENCIES
110114
apt-get remove --purge -y apt-transport-https

0 commit comments

Comments
 (0)