Skip to content

Commit b68d926

Browse files
authored
feat!: update clang/LLVM to version 16.0.6 (#191)
* feat: update clang to version 17 * fix: update after merge from main * chore: update mull to main * chore: update clang apt version * chore: add sbom to artifacts * chore: switch to wildcard when version is not yet fixed * chore: add workaround for mull MAX_PATH_SIZE * chore: use correct define name * chore: revert workaround for mull compilation * chore: remove duplicate step in build-push * feat!: update clang-15 to clang-16 * chore: remove name from devcontainer.json * chore: include stl code in clang test * chore: remove experimental pass manager option
1 parent 703e7aa commit b68d926

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

.devcontainer/Dockerfile

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ FROM ubuntu@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f
22

33
ARG BATS_VERSION=1.10.0
44
ARG CCACHE_VERSION=4.8.3
5-
ARG CLANG_VERSION=15
5+
ARG CLANG_VERSION=16
66
ARG DOCKER_VERSION=24.0.6
7-
ARG MULL_VERSION=0.20.0
8-
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.19
7+
ARG MULL_VERSION=main
8+
ARG INCLUDE_WHAT_YOU_USE_VERSION=0.20
99
ARG XWIN_VERSION=0.3.1
1010

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

6363
# Install ccache from source for a recent version
6464
RUN wget -qO - https://github.com/ccache/ccache/archive/refs/tags/v${CCACHE_VERSION}.tar.gz | tar xz -C /tmp \
65-
&& CC=clang-${CLANG_VERSION} CXX=clang++-${CLANG_VERSION} cmake -DCMAKE_BUILD_TYPE=Release -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
65+
&& CC=clang CXX=clang++ cmake -DCMAKE_BUILD_TYPE=Release -S /tmp/ccache-${CCACHE_VERSION} -B /tmp/ccache-${CCACHE_VERSION}/build \
6666
&& cmake --build /tmp/ccache-${CCACHE_VERSION}/build --target install \
6767
&& rm -rf /tmp/ccache-${CCACHE_VERSION}
6868

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
2-
"clang-15": "1:15.0.7-0ubuntu0.22.04.3",
3-
"clangd-15": "1:15.0.7-0ubuntu0.22.04.3",
4-
"clang-format-15": "1:15.0.7-0ubuntu0.22.04.3",
5-
"clang-tidy-15": "1:15.0.7-0ubuntu0.22.04.3",
6-
"clang-tools-15": "1:15.0.7-0ubuntu0.22.04.3",
7-
"lld-15": "1:15.0.7-0ubuntu0.22.04.3",
8-
"llvm-15": "1:15.0.7-0ubuntu0.22.04.3"
2+
"clang-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
3+
"clangd-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
4+
"clang-format-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
5+
"clang-tidy-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
6+
"clang-tools-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
7+
"libclang-rt-16-dev": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
8+
"lld-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105",
9+
"llvm-16": "1:16.0.6~++20230710042027+7cbf1a259152-1~exp1~20230710162048.105"
910
}

.devcontainer/devcontainer.json

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
// This devcontainer has been set-up to run docker-from-docker scenarios as per
33
// https://github.com/microsoft/vscode-dev-containers/tree/main/containers/docker-from-docker
4-
"name": "amp-devcontainer",
54
"build": {
65
"dockerfile": "Dockerfile",
76
"context": ".."

test/clang-cl/main.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
int main(int argc, const char* argv[])
1+
#include <iostream>
2+
3+
int main()
24
{
5+
std::cout << "Hello World!" << std::endl;
36
return 0;
47
}

test/mutation/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if (ENABLE_MUTATION_TESTING_TEST)
1212

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

0 commit comments

Comments
 (0)