Skip to content

Revert CI workaround #589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janniclas merged 4 commits into from
Feb 19, 2023
Merged

Revert CI workaround #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec5c0af
Revert CI workaround
Feb 19, 2023
14ef7e3
add libclang-rt-14-dev to strategy deps
Feb 19, 2023
f0631c3
adapt Dockerfile accordingly
Feb 19, 2023
871e666
Merge branch 'development' into f-RevertCIWorkaround
janniclas Feb 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,8 @@ jobs:
libclang-common-14-dev \
libclang-14-dev \
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*
clang-tidy-14 \
libclang-rt-14-dev

- uses: swift-actions/setup-swift@v1
- name: Building Phasar in ${{ matrix.build }} with ${{ matrix.compiler[0] }}
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down