Merge branch 'main' into chore/tighten-security-by-adding-more-hash-checks

Signed-off-by: Ron <[email protected]>

Author: rjaegers

.devcontainer/cpp/Dockerfile

@@ -19,11 +19,11 @@ RUN tar xzf /bats-core.tar.gz && mv bats-core-*/ bats-core \
 
 FROM ubuntu:24.04@sha256:9cbed754112939e914291337b5e554b07ad7c392491dba6daf25eef1332a22e8
 
-ARG CCACHE_VERSION=4.11
+ARG CCACHE_VERSION=4.12
 ARG CLANG_VERSION=18
 ARG CPM_VERSION=0.40.2
 ARG INCLUDE_WHAT_YOU_USE_VERSION=0.22
-ARG XWIN_VERSION=0.6.5
+ARG XWIN_VERSION=0.6.7
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -83,16 +83,9 @@ RUN --mount=from=extractor,target=/src \
  && cp -r /src/bats-support /usr/local/bats-support \
  && cp -r /src/bats-assert /usr/local/bats-assert
 
-# Install xwin
-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"
-
-# Compile and install additional clang tools; often necessary as binary arm64 builds are lacking, or packages are out-of-date
-# Install ccache from source for a recent version
-RUN --mount=type=cache,target=/cache,sharing=locked \
- wget --no-hsts -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
- && 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 \
- && cmake --build /tmp/ccache-${CCACHE_VERSION}/build --target install \
- && rm -rf /tmp/ccache-${CCACHE_VERSION}
+# Install xwin and ccache
+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" \
+ && wget --no-hsts -qO - "https://github.com/ccache/ccache/releases/download/v${CCACHE_VERSION}/ccache-${CCACHE_VERSION}-linux-$(uname -m).tar.xz" | tar -xJ -C /usr/local/bin --strip-components=1 "ccache-${CCACHE_VERSION}-linux-$(uname -m)/ccache"
 
 # Install include-what-you-use (iwyu) from source
 # hadolint ignore=DL3008

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "6.3.0"
+  ".": "6.4.0"
 }

CHANGELOG.md

@@ -4,6 +4,28 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [6.4.0](https://github.com/philips-software/amp-devcontainer/compare/v6.3.0...v6.4.0) (2025-09-18)
+
+
+### Features
+
+* Implement better clean up strategy ([#926](https://github.com/philips-software/amp-devcontainer/issues/926)) ([616126f](https://github.com/philips-software/amp-devcontainer/commit/616126f197d814be43c31f6b7bdce42cf16bf4ee))
+
+
+### Bug Fixes
+
+* Container size diff merge issues ([#930](https://github.com/philips-software/amp-devcontainer/issues/930)) ([5d03602](https://github.com/philips-software/amp-devcontainer/commit/5d03602a1295b13c4109b7d51df17d3a9fb8259e))
+* Remove duplicate sha256: in release notes ([#922](https://github.com/philips-software/amp-devcontainer/issues/922)) ([1e66947](https://github.com/philips-software/amp-devcontainer/commit/1e669473c513a2aa4722ee2ff144ad3510eb7ddd))
+
+
+### Chores
+
+* **deps, cpp:** Update ccache to 4.12 ([#927](https://github.com/philips-software/amp-devcontainer/issues/927)) ([1123f2c](https://github.com/philips-software/amp-devcontainer/commit/1123f2c04b9830b184b997c86d6a57d1b85ffcdb))
+* **deps, cpp:** Update github.copilot, github.vscode-pull-request-github, ms-vscode.cpptools in devcontainer.json ([#920](https://github.com/philips-software/amp-devcontainer/issues/920)) ([9eb7f01](https://github.com/philips-software/amp-devcontainer/commit/9eb7f0137e5cd666eb2a18b88466ff4cc3808222))
+* **deps, cpp:** Update ms-vscode.cpptools in devcontainer-metadata-vscode.json ([#919](https://github.com/philips-software/amp-devcontainer/issues/919)) ([4d54b1e](https://github.com/philips-software/amp-devcontainer/commit/4d54b1e2df598a9c113da3d080991c12a08e25c5))
+* **deps, cpp:** Update xwin to 0.6.7 ([#928](https://github.com/philips-software/amp-devcontainer/issues/928)) ([d027ad2](https://github.com/philips-software/amp-devcontainer/commit/d027ad2fa8b69c635ccbfc4ea75621be1f5e90be))
+* Manually update devcontainer.json extensions for rust ([#925](https://github.com/philips-software/amp-devcontainer/issues/925)) ([deb97bf](https://github.com/philips-software/amp-devcontainer/commit/deb97bff90e1ce71e7f234f789e733a290ee24b4))
+
 ## [6.3.0](https://github.com/philips-software/amp-devcontainer/compare/v6.2.3...v6.3.0) (2025-09-09)