From 8e8bbe8a16796cc512cabb2b7ab0cd48ad649b64 Mon Sep 17 00:00:00 2001 From: Tim Gymnich Date: Thu, 15 Aug 2024 16:49:38 +0200 Subject: [PATCH] add ubuntu 24 --- .github/workflows/docker-publish.yml | 12 ++++++++++++ Dockerfile | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 40cc035..2253e3e 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -17,6 +17,18 @@ jobs: llvm: 11 - ubuntu: 22 llvm: 12 + - ubuntu: 24 + llvm: 11 + - ubuntu: 24 + llvm: 12 + - ubuntu: 24 + llvm: 13 + - ubuntu: 24 + llvm: 14 + - ubuntu: 24 + llvm: 15 + - ubuntu: 24 + llvm: 16 permissions: packages: write contents: read diff --git a/Dockerfile b/Dockerfile index 0387e8e..b660eef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,11 @@ RUN apt-get -q update \ && apt-add-repository "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-$LLVM_VERSION main" \ && apt-get -q update \ && apt-get install -y --no-install-recommends sudo git ssh zlib1g-dev libzstd-dev automake autoconf cmake make lldb ninja-build gcc g++ gfortran build-essential libtool llvm-$LLVM_VERSION-dev clang-format clangd clang-$LLVM_VERSION libclang-$LLVM_VERSION-dev libomp-$LLVM_VERSION-dev libblas-dev libeigen3-dev libboost-dev python3 python3-pip \ - && python3 -m pip install --upgrade pip lit pathlib2 \ + if [ "$UBUNTU_VERSION" == "22.04" ] ; then \ + python3 -m pip install --break-system-packages lit pathlib2 \ + else \ + python3 -m pip install lit pathlib2 \ + fi \ && groupadd --gid $USER_GID $USERNAME \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \