Skip to content

Commit 519ded8

Browse files
committed
Fixed clang build
1 parent 3ef74da commit 519ded8

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.devcontainer/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ RUN wget https://apt.llvm.org/llvm.sh && \
2626
./llvm.sh 16
2727

2828
# Update alternatives to use clang-16 by default
29-
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100 && \
30-
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-16 100 && \
31-
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
29+
RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 10000 && \
30+
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-16 10000 && \
31+
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 10000
3232

3333
# Update alternatives to use gcc-13 by default
34-
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 && \
35-
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100
34+
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 10000 && \
35+
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 10000
3636

3737
# Install libiconv
3838
ENV LIBICONV_VERSION=1.15

.github/actions/prepare_vm/action.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ runs:
1818
wget https://apt.llvm.org/llvm.sh
1919
chmod u+x llvm.sh
2020
sudo ./llvm.sh 16
21-
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 100
22-
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 100
21+
sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 10000
22+
sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 10000
2323
24-
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100
25-
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 100
24+
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 10000
25+
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 10000
2626
2727
wget https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz
2828
tar -xvzf libiconv-1.15.tar.gz

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: actions/cache/restore@v4
4747
with:
4848
path: ~/.ccache
49-
key: ubuntu-22.04-ccache-${{ matrix.compiler }}-${{steps.ccache_cache_timestamp.outputs.timestamp }}
49+
key: ubuntu-22.04-ccache-${{ matrix.compiler }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
5050
restore-keys: |
5151
ubuntu-22.04-ccache-${{ matrix.compiler }}-
5252
- name: Build

.github/workflows/warmup_cache.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: actions/cache@v4
3131
with:
3232
path: ~/.ccache
33-
key: ubuntu-22.04-ccache-${{ matrix.compiler }}-${{steps.ccache_cache_timestamp.outputs.timestamp }}
33+
key: ubuntu-22.04-ccache-${{ matrix.compiler }}-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
3434
restore-keys: |
3535
ubuntu-22.04-ccache-${{ matrix.compiler }}-
3636
- name: Build

0 commit comments

Comments
 (0)