Skip to content

Commit d0dc836

Browse files
rjaegersrjaegers
authored
Merge branch 'main' into feature/amp-devcontainer-cpp/update-vscode-extensions
2 parents 0bac2cb + 54c0f1a commit d0dc836

File tree

11 files changed

+44
-45
lines changed

11 files changed

+44
-45
lines changed

‎.devcontainer/cpp/Dockerfile‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
FROM ubuntu:24.04@sha256:72297848456d5d37d1262630108ab308d3e9ec7ed1c3286a32fe09856619a782
22

33
ARG BATS_VERSION=1.11.0
4-
ARG CCACHE_VERSION=4.10.1
4+
ARG CCACHE_VERSION=4.11
55
ARG CLANG_VERSION=18
66
ARG CPM_VERSION=0.40.2
77
ARG DOCKER_VERSION=27.3.1
8-
ARG MULL_VERSION=0.24.0
98
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.22
109
ARG XWIN_VERSION=0.6.5
1110

@@ -37,12 +36,14 @@ ENV CMAKE_GENERATOR="Ninja"
3736
ENV CMAKE_EXPORT_COMPILE_COMMANDS="On"
3837
ENV CCACHE_DIR=/root/.ccache
3938

40-
# Install clang toolchain
39+
# Install clang toolchain and mull mutation testing framework
4140
COPY .devcontainer/cpp/apt-requirements-clang.json /tmp/apt-requirements-clang.json
4241
# hadolint ignore=SC1091
4342
RUN wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor -o /usr/share/keyrings/llvm-snapshot-keyring.gpg \
43+
&& 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 \
4444
&& UBUNTU_CODENAME=$(. /etc/os-release; echo "${UBUNTU_CODENAME/*, /}") \
4545
&& 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 \
46+
&& 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 \
4647
&& echo -e 'Package: *\nPin: origin "apt.llvm.org"\nPin-Priority: 1000' > /etc/apt/preferences \
4748
&& apt-get update \
4849
&& jq -r 'to_entries | .[] | .key + "=" + .value' /tmp/apt-requirements-clang.json | xargs apt-get install -y --no-install-recommends \
@@ -71,25 +72,21 @@ RUN batstmp="$(mktemp -d /tmp/bats-core-${BATS_VERSION}.XXXX)" \
7172
# Install xwin
7273
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"
7374

74-
# Compile and install additional clang tools; often necessary as a binary arm64 build are lacking, or packages are out-of-date
75+
# Compile and install additional clang tools; often necessary as binary arm64 builds are lacking, or packages are out-of-date
7576
# Install ccache from source for a recent version
7677
RUN wget -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
7778
&& 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 \
7879
&& cmake --build /tmp/ccache-${CCACHE_VERSION}/build --target install \
7980
&& rm -rf /tmp/ccache-${CCACHE_VERSION}
8081

81-
# Install include-what-you-use (iwyu) and Mull from source
82+
# Install include-what-you-use (iwyu) from source
8283
# hadolint ignore=DL3008
8384
RUN --mount=type=cache,target=/root/.ccache,sharing=locked \
84-
apt-get update && apt-get install -y --no-install-recommends libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev libsqlite3-dev \
85+
apt-get update && apt-get install -y --no-install-recommends libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev \
8586
&& 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 \
8687
&& CC=clang CXX=clang++ cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -S /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} -B /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build \
8788
&& cmake --build /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build --target install \
8889
&& rm -rf /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} \
89-
&& git -C /tmp clone --recurse-submodules -b ${MULL_VERSION} https://github.com/mull-project/mull.git \
90-
&& CC=clang CXX=clang++ cmake -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -S /tmp/mull -B /tmp/mull/build \
91-
&& cmake --build /tmp/mull/build --target install \
92-
&& rm -rf /tmp/mull \
9390
&& apt-get purge -y libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev libsqlite3-dev \
9491
&& apt-get autoremove -y \
9592
&& apt-get clean \
@@ -101,8 +98,9 @@ RUN update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++-14 20 \
10198
&& update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 20 \
10299
&& update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-14 10 \
103100
&& update-alternatives --install /usr/bin/iwyu iwyu /usr/local/bin/include-what-you-use 10 \
104-
&& update-alternatives --install /usr/bin/mull-runner mull-runner /usr/local/bin/mull-runner-${CLANG_VERSION} 10 \
105-
&& update-alternatives --install /usr/lib/mull-ir-frontend mull-ir-frontend /usr/local/lib/mull-ir-frontend-${CLANG_VERSION} 10 \
101+
&& update-alternatives --install /usr/bin/mull-runner mull-runner /usr/bin/mull-runner-${CLANG_VERSION} 10 \
102+
&& update-alternatives --install /usr/bin/mull-reporter mull-reporter /usr/bin/mull-reporter-${CLANG_VERSION} 10 \
103+
&& update-alternatives --install /usr/lib/mull-ir-frontend mull-ir-frontend /usr/lib/mull-ir-frontend-${CLANG_VERSION} 10 \
106104
&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
107105
&& cp /etc/skel/.bashrc /root/.bashrc
108106

‎.devcontainer/cpp/apt-requirements-clang.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@
66
"clang-tools-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
77
"libclang-rt-18-dev": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
88
"lld-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
9-
"llvm-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92"
9+
"llvm-18": "1:18.1.8~++20240731025043+3b5b5c1ec4a3-1~exp1~20240731145144.92",
10+
"mull-18": "0.25.0"
1011
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"extensions": [
88
"[email protected]",
99
"[email protected]",
10-
"[email protected].2319",
10+
"[email protected].2330",
1111
"[email protected]",
12-
"usernamehw.errorlens@3.23.0"
12+
"usernamehw.errorlens@3.24.0"
1313
]
1414
}
1515
}

‎.github/workflows/build-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
with:
120120
comment-summary-in-pr: on-failure
121121
fail-on-severity: critical
122-
- uses: actions/attest-build-provenance@bd77c077858b8d561b7a36cbe48ef4cc642ca39d # v2.2.2
122+
- uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
123123
if: github.event_name != 'merge_group'
124124
with:
125125
subject-name: ${{ env.REGISTRY }}/${{ github.repository }}-${{ matrix.flavor }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
APPLY_FIXES: all
3232
VALIDATE_ALL_CODEBASE: true
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
34-
- uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
34+
- uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
3535
if: success() || failure()
3636
with:
3737
sarif_file: megalinter-reports/megalinter-report.sarif

‎.github/workflows/ossf-scorecard.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ jobs:
2727
results_format: sarif
2828
repo_token: ${{ secrets.SCORECARD_TOKEN }}
2929
publish_results: true
30-
- uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
30+
- uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
3131
with:
3232
sarif_file: results.sarif

‎.github/workflows/release-please.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
with:
2222
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
2323
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
24-
- uses: googleapis/release-please-action@d1a8f221d7723166f48a584aebba00ef3f6febec # v4.1.4
24+
- uses: googleapis/release-please-action@a02a34c4d625f9be7cb89156071d8567266a2445 # v4.2.0
2525
with:
2626
token: ${{ steps.token.outputs.token }}

‎.github/workflows/update-dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
with:
3535
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
3636
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
37-
- uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
37+
- uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
3838
with:
3939
commit-message: "Update ${{ join(fromJson(steps.update-packages.outputs.updated-dependencies), ', ') }}"
4040
branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-apt-packages
@@ -63,7 +63,7 @@ jobs:
6363
with:
6464
app-id: ${{ vars.FOREST_RELEASER_APP_ID }}
6565
private-key: ${{ secrets.FOREST_RELEASER_APP_PRIVATE_KEY }}
66-
- uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # v7.0.7
66+
- uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
6767
with:
6868
commit-message: "Update ${{ join(fromJson(steps.update-extensions.outputs.updated-dependencies), ', ') }}"
6969
branch: feature/amp-devcontainer-${{ matrix.flavor }}/update-vscode-extensions

‎.github/workflows/vulnerability-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
image: ghcr.io/${{ github.repository }}-${{ matrix.flavor }}:latest
2424
dockerfile: .devcontainer/Dockerfile
25-
- uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
25+
- uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
2626
if: steps.scan.outputs.sarif != ''
2727
with:
2828
sarif_file: ${{ steps.scan.outputs.sarif }}

‎package-lock.json‎

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)