Skip to content

Commit f7b357b

Browse files
authored
feat: add rust container flavor (#351)
* feat: add rust container flavor * ci: fix linter findings * ci: ignore some linter findings * ci: run for all flavours * ci: fix tests for rust container flavor * chore: add pkg-config * ci: fix linter findings * chore: modify build and push workflow for flavors * chore: reduce container size * chore: add Docker extension to devcontainer.json * chore: update rust from 1.76.0 to 1.77.2 * ci: publish result of all testsuites * ci: fix duplicate artifact * Update ci.yml * ci: different fix for multiple artifacts * ci: update all automation to cope with multiple containers * chore: move update-apt-packages to own action * chore: add flip-link package * chore: process review comments * chore: merge the -vscode image into the main image * Update build-push.yml * chore: minor fix after merge * chore: move Rust container to Ubuntu 24.04 * chore: update Rust to latest version * chore: update Docker cli from 25.0.3 to 26.1.1 * chore: add more test for Rust container * chore: reduce duplication in test code * chore: add test for coverage * chore: remove unused bats tags * chore: don't use run in bats tests when not needed See also: https://bats-core.readthedocs.io/en/stable/writing-tests.html#when-not-to-use-run * chore: add mutation testing support to Rust container * chore: correct test name to beter reflect its actual scope * docs: update documentation
1 parent 5804c2b commit f7b357b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+819
-250
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ubuntu:24.04@sha256:3f85b7caad41a95462cf5b787d8a04604c8262cdcdf9a472b8c52ef
33
ARG BATS_VERSION=1.10.0
44
ARG CCACHE_VERSION=4.9.1
55
ARG CLANG_VERSION=17
6-
ARG DOCKER_VERSION=25.0.3
6+
ARG DOCKER_VERSION=26.1.1
77
ARG MULL_VERSION=main
88
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.21
99
ARG XWIN_VERSION=0.5.0
@@ -15,7 +15,7 @@ HEALTHCHECK NONE
1515
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1616

1717
# Install the base system with all tool dependencies
18-
COPY .devcontainer/apt-requirements-base.json /tmp/apt-requirements-base.json
18+
COPY .devcontainer/cpp/apt-requirements-base.json /tmp/apt-requirements-base.json
1919
# hadolint ignore=DL3008
2020
RUN apt-get update && apt-get install -y --no-install-recommends jq \
2121
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-base.json | xargs apt-get install -y --no-install-recommends \
@@ -27,7 +27,7 @@ RUN wget -qO /usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt https:/
2727
&& update-ca-certificates
2828

2929
# Install some tools via pip to get more recent versions
30-
COPY .devcontainer/requirements.txt /tmp/requirements.txt
30+
COPY .devcontainer/cpp/requirements.txt /tmp/requirements.txt
3131
RUN python3 -m pip install --break-system-packages --require-hashes --no-cache-dir -r /tmp/requirements.txt \
3232
&& rm -rf /tmp/requirements.txt
3333

@@ -36,7 +36,7 @@ ENV CMAKE_GENERATOR="Ninja"
3636
ENV CMAKE_EXPORT_COMPILE_COMMANDS="On"
3737

3838
# Install clang toolchain
39-
COPY .devcontainer/apt-requirements-clang.json /tmp/apt-requirements-clang.json
39+
COPY .devcontainer/cpp/apt-requirements-clang.json /tmp/apt-requirements-clang.json
4040
# hadolint ignore=SC1091
4141
RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot-keyring.gpg \
4242
&& UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}") \
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
{
22
"build": {
33
"dockerfile": "Dockerfile",
4-
"context": ".."
4+
"context": "../.."
5+
},
6+
"remoteEnv": {
7+
"CONTAINER_FLAVOR": "cpp"
58
},
69
"mounts": [
710
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
@@ -14,9 +17,11 @@
1417
"jetmartin.bats@0.1.10",
1518
"matepek.vscode-catch2-test-adapter@4.6.3",
1619
"mhutchie.git-graph@1.30.0",
20+
"ms-azuretools.vscode-docker@1.29.0",
1721
"ms-vscode.cmake-tools@1.16.32",
1822
"ms-vscode.cpptools@1.18.5",
19-
"SonarSource.sonarlint-vscode@4.1.0"
23+
"SonarSource.sonarlint-vscode@4.1.0",
24+
"usernamehw.errorlens@3.16.0"
2025
]
2126
}
2227
}
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ include(GoogleTest)
66

77
add_subdirectory(clang-cl)
88
add_subdirectory(clang-tools)
9-
add_subdirectory(coverage)
109
add_subdirectory(fuzzing)
1110
add_subdirectory(gcc)
1211
add_subdirectory(gcc-arm-none-eabi)
13-
add_subdirectory(mutation)
1412
add_subdirectory(sanitizers)
13+
add_subdirectory(test)
File renamed without changes.

0 commit comments

Comments
 (0)