From b1b316ac3484ed384996498f3f95ceba95f4639e Mon Sep 17 00:00:00 2001 From: Christian Parpart Date: Mon, 30 Sep 2024 20:24:33 +0200 Subject: [PATCH] Overall old Ubuntu 22.04 removals. We only want to support latest LTS of Ubuntu Signed-off-by: Christian Parpart --- .github/appimage/AppImageBuilder.yml | 6 +++--- .github/appimage/Dockerfile | 4 ++-- .github/workflows/build.yml | 2 +- .github/workflows/changelog.yml | 2 +- .github/workflows/codechecker-analysis.yml | 6 +++--- metainfo.xml | 1 + scripts/install-deps.sh | 3 +-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/appimage/AppImageBuilder.yml b/.github/appimage/AppImageBuilder.yml index b15231d4f2..958a97259c 100644 --- a/.github/appimage/AppImageBuilder.yml +++ b/.github/appimage/AppImageBuilder.yml @@ -17,9 +17,9 @@ AppDir: exec_args: $@ apt: arch: amd64 + allow_unauthenticated: true sources: - - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' - key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C' + - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse' include: - glibc-source:amd64 @@ -53,7 +53,7 @@ AppDir: - qt6-declarative-dev:amd64 - qt6-multimedia-dev:amd64 - qt6-qpa-plugins:amd64 - - libyaml-cpp0.7:amd64 + - libyaml-cpp0.8:amd64 - libutempter-dev:amd64 - libssh2-1:amd64 - libx11-xcb1:amd64 diff --git a/.github/appimage/Dockerfile b/.github/appimage/Dockerfile index a5bf581564..3ea1c1793e 100644 --- a/.github/appimage/Dockerfile +++ b/.github/appimage/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 RUN apt-get update RUN apt-get install -y sudo clang wget @@ -21,6 +21,6 @@ RUN cmake --build build --target install RUN sudo apt install -y binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync RUN sudo wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool RUN sudo chmod +x /usr/local/bin/appimagetool -RUN sudo sudo pip3 install appimage-builder +RUN sudo sudo pip3 install appimage-builder --break-system-packages RUN appimage-builder --recipe $PWD/.github/appimage/AppImageBuilder.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f8f9c020f..914d05564c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -681,7 +681,7 @@ jobs: # {{{ Linux AppImage (Using Ubuntu 24.04 as base). package_for_AppImage: name: "Packaging for AppImage" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: Set up QEMU diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 7e64de09b1..5feae6bdd6 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -9,7 +9,7 @@ on: jobs: Check-Changelog: name: Check Changelog Action - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: tarides/changelog-check-action@v2 name: Check changelog diff --git a/.github/workflows/codechecker-analysis.yml b/.github/workflows/codechecker-analysis.yml index 4769846fac..cd64fbc262 100644 --- a/.github/workflows/codechecker-analysis.yml +++ b/.github/workflows/codechecker-analysis.yml @@ -28,9 +28,9 @@ concurrency: cancel-in-progress: true jobs: - ubuntu_2004: - name: "Ubuntu Linux 22.04" - runs-on: ubuntu-22.04 + ubuntu: + name: "Ubuntu Linux" + runs-on: ubuntu-latest steps: - name: "Check out repository" uses: actions/checkout@v3 diff --git a/metainfo.xml b/metainfo.xml index 9a9e6df716..65b53f7343 100644 --- a/metainfo.xml +++ b/metainfo.xml @@ -109,6 +109,7 @@ diff --git a/scripts/install-deps.sh b/scripts/install-deps.sh index 2ea0cff935..d7993f90b4 100755 --- a/scripts/install-deps.sh +++ b/scripts/install-deps.sh @@ -305,7 +305,7 @@ install_deps_ubuntu() fetch_and_unpack_Catch2 ;; *) - packages="$packages libfmt-dev librange-v3-dev catch2" + packages="$packages librange-v3-dev catch2" ;; esac @@ -322,7 +322,6 @@ install_deps_FreeBSD() [ x$PREPARE_ONLY_EMBEDS = xON ] && return - # NB: libfmt is available in pkg, but it's not version >= 9.0.0 (as of 2022-09-03). # NB: catch2 (as name "catch") is available in pkg, but it's not version >= 3.0.0. su root -c "pkg install $SYSDEP_ASSUME_YES \ cmake \