Skip to content

Commit

Permalink
Merge branch 'main' into feature/add-caching-to-xwin-installation
Browse files Browse the repository at this point in the history
  • Loading branch information
rjaegers authored Nov 8, 2023
2 parents 3e2bfcd + b68d926 commit 77194b4
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 17 deletions.
12 changes: 6 additions & 6 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ FROM ubuntu@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f

ARG BATS_VERSION=1.10.0
ARG CCACHE_VERSION=4.8.3
ARG CLANG_VERSION=15
ARG CLANG_VERSION=16
ARG DOCKER_VERSION=24.0.6
ARG MULL_VERSION=0.20.0
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.19
ARG MULL_VERSION=main
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.20
ARG XWIN_VERSION=0.3.1

ARG DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -48,11 +48,11 @@ ENV PATH="$PATH:/usr/lib/llvm-${CLANG_VERSION}/bin"
# hadolint ignore=DL3008
RUN apt-get update && apt-get install -y --no-install-recommends libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev libsqlite3-dev \
&& 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 \
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -S /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} -B /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build \
&& 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 \
&& cmake --build /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION}/build --target install \
&& rm -rf /tmp/include-what-you-use-${INCLUDE_WHAT_YOU_USE_VERSION} \
&& git -C /tmp clone --recurse-submodules -b ${MULL_VERSION} https://github.com/mull-project/mull.git \
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -S /tmp/mull -B /tmp/mull/build \
&& CC=clang CXX=clang++ cmake -S /tmp/mull -B /tmp/mull/build \
&& cmake --build /tmp/mull/build --target install \
&& rm -rf /tmp/mull \
&& apt-get purge -y libclang-${CLANG_VERSION}-dev llvm-${CLANG_VERSION}-dev libsqlite3-dev \
Expand All @@ -62,7 +62,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends libclang-${CLAN

# Install ccache from source for a recent version
RUN wget -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -DCMAKE_BUILD_TYPE=Release -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
&& CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -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}

Expand Down
15 changes: 8 additions & 7 deletions .devcontainer/apt-requirements-clang.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"clang-15": "1:15.0.7-0ubuntu0.22.04.3",
"clangd-15": "1:15.0.7-0ubuntu0.22.04.3",
"clang-format-15": "1:15.0.7-0ubuntu0.22.04.3",
"clang-tidy-15": "1:15.0.7-0ubuntu0.22.04.3",
"clang-tools-15": "1:15.0.7-0ubuntu0.22.04.3",
"lld-15": "1:15.0.7-0ubuntu0.22.04.3",
"llvm-15": "1:15.0.7-0ubuntu0.22.04.3"
"clang-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clangd-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clang-format-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clang-tidy-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"clang-tools-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"libclang-rt-16-dev": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"lld-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
"llvm-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105"
}
1 change: 0 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
// This devcontainer has been set-up to run docker-from-docker scenarios as per
// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/docker-from-docker
"name": "amp-devcontainer",
"build": {
"dockerfile": "Dockerfile",
"context": ".."
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "3.1.0"
".": "3.1.1"
}
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ 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/).

## [3.1.1](https://github.com/philips-software/amp-devcontainer/compare/v3.1.0...v3.1.1) (2023-11-07)


### Bug Fixes

* **cosign:** Correctly sign multiple tags ([#192](https://github.com/philips-software/amp-devcontainer/issues/192)) ([bcd2f38](https://github.com/philips-software/amp-devcontainer/commit/bcd2f3895b6780410acf64b1f9b68472cbc9f579))

## [3.1.0](https://github.com/philips-software/amp-devcontainer/compare/v3.0.0...v3.1.0) (2023-10-31)


Expand Down
5 changes: 4 additions & 1 deletion test/clang-cl/main.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
int main(int argc, const char* argv[])
#include <iostream>

int main()
{
std::cout << "Hello World!" << std::endl;
return 0;
}
2 changes: 1 addition & 1 deletion test/mutation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (ENABLE_MUTATION_TESTING_TEST)

add_executable(test-mutation EXCLUDE_FROM_ALL test.cpp)
target_compile_options(test-mutation PRIVATE
-g -O0 -grecord-command-line -fprofile-instr-generate -fcoverage-mapping -fexperimental-new-pass-manager -fpass-plugin=/usr/lib/mull-ir-frontend
-g -O0 -grecord-command-line -fprofile-instr-generate -fcoverage-mapping -fpass-plugin=/usr/lib/mull-ir-frontend
)
target_link_libraries(test-mutation PRIVATE gmock_main)
add_test(NAME test-mutation COMMAND mull-runner $<TARGET_FILE:test-mutation>)
Expand Down

0 comments on commit 77194b4

Please sign in to comment.