From ec5c0afe09e34a9273f5b4a282841a3acac6eb70 Mon Sep 17 00:00:00 2001 From: Martin Mory Date: Sun, 19 Feb 2023 14:20:55 +0100 Subject: [PATCH 1/3] Revert CI workaround --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba55bde335..203e3d2601 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,13 +53,6 @@ jobs: libclang-cpp14-dev \ clang-tidy-14 - - name: Workaround for sanitizer - shell: bash - run: | - sudo apt-get update - sudo apt download libclang-rt-14-dev - sudo dpkg --force-all -i libclang-rt-14-dev* - - uses: swift-actions/setup-swift@v1 - name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }} env: From 14ef7e3c80565d23dbb1e068a71d936ae40a0838 Mon Sep 17 00:00:00 2001 From: Martin Mory Date: Sun, 19 Feb 2023 14:36:18 +0100 Subject: [PATCH 2/3] add libclang-rt-14-dev to strategy deps --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 203e3d2601..6e4c32f0bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,8 @@ jobs: libclang-common-14-dev \ libclang-14-dev \ libclang-cpp14-dev \ - clang-tidy-14 + clang-tidy-14 \ + libclang-rt-14-dev - uses: swift-actions/setup-swift@v1 - name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }} From f0631c3ce9fc762e882636d95dcfb7620d2a6acb Mon Sep 17 00:00:00 2001 From: Martin Mory Date: Sun, 19 Feb 2023 14:51:37 +0100 Subject: [PATCH 3/3] adapt Dockerfile accordingly --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7bc1363f08..f91375c66d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,9 +33,8 @@ RUN apt-key adv --fetch-keys https://apt.llvm.org/llvm-snapshot.gpg.key && \ libclang-common-14-dev \ libclang-14-dev \ libclang-cpp14-dev \ - clang-tidy-14 && \ - apt download libclang-rt-14-dev && \ - dpkg --force-all -i libclang-rt-14-dev* + clang-tidy-14 \ + libclang-rt-14-dev RUN pip3 install Pygments pyyaml