Skip to content

Commit 2accf5a

Browse files
committed
reverted clang 20 usage because of missing packages
1 parent 7c45cd8 commit 2accf5a

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

.devcontainer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
4444
RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-${GCC_VER}) 100
4545
RUN update-alternatives --install /usr/bin/g++ g++ $(which g++-${GCC_VER}) 100
4646

47-
ARG LLVM_VER="20"
47+
ARG LLVM_VER="19"
4848
# Add clang-${LLVM_VER}
4949
ARG LLVM_URL="http://apt.llvm.org/${VARIANT}/"
5050
ARG LLVM_PKG="llvm-toolchain-${VARIANT}-${LLVM_VER}"

.github/workflows/build_cmake.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
{name: 'Clang 16', preset: clang-16, pkgs: 'clang-16 llvm-16'},
4343
{name: 'Clang 17', preset: clang-17, pkgs: 'clang-17 llvm-17'},
4444
{name: 'Clang 18', preset: clang-18, pkgs: 'clang-18 llvm-18'},
45-
{name: 'Clang 19', preset: clang-19, pkgs: 'clang-19 llvm-19'},
46-
{name: 'Clang 20', preset: clang-20, pkgs: 'clang-20 llvm-20'}
45+
{name: 'Clang 19', preset: clang-19, pkgs: 'clang-19 llvm-19'}
4746
]
4847
cxx: [17, 20]
4948

@@ -150,7 +149,7 @@ jobs:
150149
matrix:
151150
os: [ubuntu-24.04]
152151
buildtype: [debug]
153-
compiler: [{name: 'Clang 20', preset: clang-20, pkgs: 'clang-20 llvm-20 llvm-20-dev libclang-20-dev', iwyu_branch: 'clang_20', path_prefix: "/usr/lib/llvm-20"}]
152+
compiler: [{name: 'Clang 19', preset: clang-19, pkgs: 'clang-19 llvm-19 llvm-19-dev libclang-19-dev', iwyu_branch: 'clang_19', path_prefix: "/usr/lib/llvm-19"}]
154153
cxx: [17, 20]
155154

156155
steps:
@@ -239,8 +238,8 @@ jobs:
239238

240239
- name: Install GCC ARM
241240
run: |
242-
wget -O archive.tar.xz "https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz" && \
243-
echo 95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4 archive.tar.xz > /tmp/archive.sha256 && sha256sum -c /tmp/archive.sha256 && rm /tmp/archive.sha256 && \
241+
wget -O archive.tar.xz "https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz" && \
242+
echo 62a63b981fe391a9cbad7ef51b17e49aeaa3e7b0d029b36ca1e9c3b2a9b78823 archive.tar.xz > /tmp/archive.sha256 && sha256sum -c /tmp/archive.sha256 && rm /tmp/archive.sha256 && \
244243
tar xf archive.tar.xz -C /opt
245244
shell: bash
246245

@@ -260,7 +259,7 @@ jobs:
260259
matrix:
261260
os: [ubuntu-24.04]
262261
buildtype: [debug]
263-
compiler: [ {name: 'Clang 20', preset: clang-20, pkgs: 'clang-20 llvm-20'} ]
262+
compiler: [ {name: 'Clang 19', preset: clang-19, pkgs: 'clang-19 llvm-19'} ]
264263

265264
steps:
266265
- uses: actions/checkout@v4

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
FROM ubuntu:24.04 as cpp-docker-common
66

77
ARG DEBIAN_FRONTEND=noninteractive
8-
ARG CLANG_COMPILER_VERSION=20
8+
ARG CLANG_COMPILER_VERSION=19
99
ARG CMAKE_VERSION=4.0.0
1010
ENV PATH="${PATH}:/cmake-${CMAKE_VERSION}-linux-x86_64/bin/:"
1111

0 commit comments

Comments
 (0)