Skip to content

Commit 0e2bfa8

Browse files
rjaegersrjaegers
authored
Merge branch 'main' into feature/add-gherkin-flavor
2 parents 500da9b + 32c3dee commit 0e2bfa8

27 files changed

+83
-63
lines changed

‎.devcontainer/cpp/Dockerfile‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,21 @@ RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-base.json,target
3434
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-base.json | \
3535
xargs apt-get install -y --no-install-recommends \
3636
# Include the Cisco Umbrella PKI Root
37-
&& wget -qO /usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt https://www.cisco.com/security/pki/certs/ciscoumbrellaroot.pem \
37+
&& wget --no-hsts -qO /usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt https://www.cisco.com/security/pki/certs/ciscoumbrellaroot.pem \
3838
&& update-ca-certificates \
39-
# Install some tools via pip to get more recent versions
40-
&& python3 -m pip install --break-system-packages --require-hashes --no-cache-dir --no-compile -r /tmp/requirements.txt
39+
# Install some tools via pip to get more recent versions, clean up afterwards
40+
&& python3 -m pip install --break-system-packages --require-hashes --no-cache-dir --no-compile -r /tmp/requirements.txt \
41+
&& find / -regex '^.*\(__pycache__\|\.py[co]\)$' -delete \
42+
&& rm -rf "$(pip cache dir)"
4143

4244
# Install clang toolchain and mull mutation testing framework
4345
RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-clang.json,target=/tmp/apt-requirements-clang.json \
4446
--mount=type=cache,target=/var/cache/apt,sharing=locked \
4547
--mount=type=cache,target=/var/lib/apt,sharing=locked \
4648
--mount=type=cache,target=/var/log,sharing=locked \
4749
--mount=type=cache,target=/tmp,sharing=locked,mode=1777 \
48-
wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot-keyring.gpg \
49-
&& wget -qO - https://dl.cloudsmith.io/public/mull-project/mull-stable/gpg.41DB35380DE6BD6F.key | gpg --dearmor -o /usr/share/keyrings/mull-project-mull-stable-archive-keyring.gpg \
50+
wget --no-hsts -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot-keyring.gpg \
51+
&& wget --no-hsts -qO - https://dl.cloudsmith.io/public/mull-project/mull-stable/gpg.41DB35380DE6BD6F.key | gpg --dearmor -o /usr/share/keyrings/mull-project-mull-stable-archive-keyring.gpg \
5052
&& UBUNTU_CODENAME=$(grep '^UBUNTU_CODENAME=' /etc/os-release | cut -d= -f2) \
5153
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot-keyring.gpg] http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-${CLANG_VERSION} main" | tee /etc/apt/sources.list.d/llvm.list > /dev/null \
5254
&& echo "deb [signed-by=/usr/share/keyrings/mull-project-mull-stable-archive-keyring.gpg] https://dl.cloudsmith.io/public/mull-project/mull-stable/deb/ubuntu ${UBUNTU_CODENAME} main" | tee /etc/apt/sources.list.d/mull-project-mull-stable.list > /dev/null \
@@ -56,23 +58,23 @@ RUN --mount=type=bind,source=.devcontainer/cpp/apt-requirements-clang.json,targe
5658

5759
# Install arm-gcc toolchain
5860
RUN mkdir /opt/gcc-arm-none-eabi \
59-
&& wget -qO - "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-$(uname -m)-arm-none-eabi.tar.xz" | tar --exclude='*arm-none-eabi-gdb*' --exclude='share' --strip-components=1 -xJC /opt/gcc-arm-none-eabi
61+
&& wget --no-hsts -qO - "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-$(uname -m)-arm-none-eabi.tar.xz" | tar --exclude='*arm-none-eabi-gdb*' --exclude='share' --strip-components=1 -xJC /opt/gcc-arm-none-eabi
6062

6163
# Install bats
6264
RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \
63-
&& wget -qO - https://github.com/bats-core/bats-core/archive/refs/tags/v${BATS_VERSION}.tar.gz | tar xz -C "${batstmp}" \
65+
&& wget --no-hsts -qO - https://github.com/bats-core/bats-core/archive/refs/tags/v${BATS_VERSION}.tar.gz | tar xz -C "${batstmp}" \
6466
&& bash "${batstmp}/bats-core-${BATS_VERSION}/install.sh" /usr/local \
6567
&& rm -rf "${batstmp}" \
6668
&& git -C /usr/local clone -b v0.3.0 https://github.com/bats-core/bats-support.git \
6769
&& git -C /usr/local clone -b v2.1.0 https://github.com/bats-core/bats-assert.git
6870

6971
# Install xwin
70-
RUN wget -qO - "https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz" | tar -xzv -C /usr/local/bin --strip-components=1 "xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl/xwin"
72+
RUN wget --no-hsts -qO - "https://github.com/Jake-Shadle/xwin/releases/download/${XWIN_VERSION}/xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl.tar.gz" | tar -xzv -C /usr/local/bin --strip-components=1 "xwin-${XWIN_VERSION}-$(uname -m)-unknown-linux-musl/xwin"
7173

7274
# Compile and install additional clang tools; often necessary as binary arm64 builds are lacking, or packages are out-of-date
7375
# Install ccache from source for a recent version
7476
RUN --mount=type=cache,target=/cache,sharing=locked \
75-
wget -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
77+
wget --no-hsts -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
7678
&& CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTING=Off -DENABLE_DOCUMENTATION=Off -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
7779
&& cmake --build /tmp/ccache-${CCACHE_VERSION}/build --target install \
7880
&& rm -rf /tmp/ccache-${CCACHE_VERSION}
@@ -83,7 +85,7 @@ RUN --mount=type=cache,target=/cache,sharing=locked \
8385
--mount=type=cache,target=/var/cache/apt,sharing=locked \
8486
--mount=type=cache,target=/var/lib/apt,sharing=locked \
8587
apt-get update && apt-get install -y --no-install-recommends libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev \
86-
&& wget -qO - https://github.com/include-what-you-use/include-what-you-use/archive/refs/tags/${INCLUDE_WHAT_YOU_USE_VERSION}.tar.gz | tar xz -C /tmp \
88+
&& wget --no-hsts -qO - https://github.com/include-what-you-use/include-what-you-use/archive/refs/tags/${INCLUDE_WHAT_YOU_USE_VERSION}.tar.gz | tar xz -C /tmp \
8789
&& CC=clang CXX=clang++ cmake -S /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} -B /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build \
8890
&& cmake --build /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build --target install \
8991
&& rm -rf /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} \
@@ -110,6 +112,6 @@ RUN --mount=type=cache,target=/var/log,sharing=locked \
110112
# - Install CPM.cmake to the CMake module path
111113
# - Configure a default profile for Conan and set the CMake generator to Ninja
112114
RUN --mount=type=cache,target=/cache,sharing=locked \
113-
wget -qP /usr/local/lib/python*/dist-packages/cmake/data/share/cmake-*/Modules/ https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_VERSION}/CPM.cmake \
115+
wget --no-hsts -qP /usr/local/lib/python*/dist-packages/cmake/data/share/cmake-*/Modules/ https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_VERSION}/CPM.cmake \
114116
&& conan profile detect \
115117
&& echo -e "\n[conf]\ntools.cmake.cmaketoolchain:generator=Ninja" >> "$(conan profile path default)"

‎.devcontainer/cpp/devcontainer-lock.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"features": {
3-
"ghcr.io/devcontainers/features/desktop-lite:1": {
4-
"version": "1.2.6",
5-
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:818bb1cd8c05948e469ef2eb1b7c3f29920624c7fb805015dcc4ba6e8f5d538b",
6-
"integrity": "sha256:818bb1cd8c05948e469ef2eb1b7c3f29920624c7fb805015dcc4ba6e8f5d538b"
3+
"ghcr.io/devcontainers/features/desktop-lite:": {
4+
"version": "1.2.7",
5+
"resolved": "ghcr.io/devcontainers/features/desktop-lite@sha256:8247ef1d9058f79e86bfe17e26c2688ac3acd726ec2966e20f19173838896983",
6+
"integrity": "sha256:8247ef1d9058f79e86bfe17e26c2688ac3acd726ec2966e20f19173838896983"
77
},
88
"ghcr.io/devcontainers/features/github-cli:1": {
99
"version": "1.0.14",

‎.devcontainer/cpp/devcontainer-metadata-vscode.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
"customizations": {
66
"vscode": {
77
"extensions": [
8-
"llvm-vs-code-extensions.vscode-clangd@0.1.33",
8+
"llvm-vs-code-extensions.vscode-clangd@0.2.0",
99
"[email protected]",
1010
"[email protected]",
1111
"[email protected]",
12-
"ms-vscode.cpptools@1.25.3",
12+
"ms-vscode.cpptools@1.26.3",
1313
"[email protected]",
14-
"sonarsource.sonarlint-vscode@4.16.0"
14+
"sonarsource.sonarlint-vscode@4.25.1"
1515
],
1616
"settings": {
1717
"C_Cpp.intelliSenseEngine": "disabled",

‎.devcontainer/cpp/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"NODE_EXTRA_CA_CERTS": "/usr/local/share/ca-certificates/Cisco_Umbrella_Root_CA.crt"
1010
},
1111
"features": {
12-
"ghcr.io/devcontainers/features/desktop-lite:1": {},
12+
"ghcr.io/devcontainers/features/desktop-lite:": {},
1313
"ghcr.io/devcontainers/features/github-cli:1": {},
1414
"ghcr.io/devcontainers/features/node:1": {}
1515
},

‎.devcontainer/cpp/requirements.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
cmake==4.0.3
2-
conan==2.17.0
2+
conan==2.18.1
33
gcovr==8.3

‎.devcontainer/cpp/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ colorlog==6.8.2 \
144144
--hash=sha256:3e3e079a41feb5a1b64f978b5ea4f46040a94f11f0e8bbb8261e3dbbeca64d44 \
145145
--hash=sha256:4dcbb62368e2800cb3c5abd348da7e53f6c362dda502ec27c560b2e58a66bd33
146146
# via gcovr
147-
conan==2.17.0 \
148-
--hash=sha256:91bca3c5b4a9b361d2a9155cf7e678707fccd738cdeb601b5ca398478f99a824
147+
conan==2.18.1 \
148+
--hash=sha256:5d8e9fac7614de9297933f65de8f17db14851a871cebc962f4856b7c294f43c5
149149
# via -r cpp/requirements.in
150150
distro==1.8.0 \
151151
--hash=sha256:02e111d1dc6a50abb8eed6bf31c3e48ed8b0830d1ea2a1b78c61765c2513fdd8 \

‎.devcontainer/rust/devcontainer-metadata-vscode.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"extensions": [
88
"[email protected]",
99
"[email protected]",
10-
"[email protected].2509",
10+
"[email protected].2519",
1111
"[email protected]",
1212
"[email protected]"
1313
]

‎.github/workflows/issue-cleanup.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
issues: write
1515
pull-requests: write
1616
steps:
17-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
17+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1818
with:
1919
disable-sudo-and-containers: true
2020
egress-policy: audit

‎.github/workflows/issue-creation-tool-versions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
permissions:
1616
issues: write
1717
steps:
18-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
18+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
1919
with:
2020
disable-sudo-and-containers: true
2121
egress-policy: audit

‎.github/workflows/linting-formatting.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
pull-requests: write
2626
security-events: write
2727
steps:
28-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
28+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2929
with:
3030
disable-sudo: true
3131
egress-policy: audit
@@ -41,7 +41,7 @@ jobs:
4141
APPLY_FIXES: all
4242
VALIDATE_ALL_CODEBASE: true
4343
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
44-
- uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
44+
- uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
4545
if: success() || failure()
4646
with:
4747
sarif_file: megalinter-reports/megalinter-report.sarif

0 commit comments

Comments
 (0)