From fb929e16e90050b3ac852e4be14444c3a1d000b6 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 30 Apr 2025 10:33:10 +0200 Subject: ci: simplify image --- CMakeLists.txt | 2 +- ci/Containerfile | 12 ++---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91410ad..8830974 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION "3.29.0") +cmake_minimum_required(VERSION "3.31.0") project("turns" LANGUAGES C CXX diff --git a/ci/Containerfile b/ci/Containerfile index 16be545..dc22bab 100644 --- a/ci/Containerfile +++ b/ci/Containerfile @@ -10,8 +10,8 @@ RUN pacman-key --init \ 'glibc' \ && pacman -Syu --noconfirm --noprogressbar --needed \ 'catch2>=3.6' \ - 'cmake>=3.29' \ - 'gcc>=14.1.0' \ + 'cmake>=3.31' \ + 'gcc>=14.2.0' \ 'git' \ 'gtkmm-4.0>=4.18' \ 'libadwaita>=1.7' \ @@ -21,14 +21,6 @@ RUN pacman-key --init \ 'weston' \ && locale-gen \ && useradd -m builduser \ - && echo 'builduser ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers \ - && mkdir aur && chown builduser: aur \ - && cd aur \ - && sudo -u builduser git clone 'https://aur.archlinux.org/cambalache.git' \ - && cd cambalache \ - && sudo -u builduser makepkg -irs --noconfirm --noprogressbar --needed \ - && cd ../.. \ - && rm -rf aur \ && yes | pacman -Sccdd ENV XDG_RUNTIME_DIR=/tmp \ -- cgit v1.2.3