Skip to content

Commit

Permalink
Merge pull request #1608 from contour-terminal/maintenance/cleanups
Browse files Browse the repository at this point in the history
Overall old Ubuntu 22.04 removals. We only want to support latest LTS  of Ubuntu
  • Loading branch information
christianparpart authored Sep 30, 2024
2 parents 631e2f4 + b1b316a commit 4f3ad7f
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/appimage/AppImageBuilder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/appimage/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.04
FROM ubuntu:24.04

RUN apt-get update
RUN apt-get install -y sudo clang wget
Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codechecker-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
<ul>
<li>Port to C++20's `std::format()` (#1598)</li>
<li>Enable support for Unicode version 16.0.0 (#1606)</li>
<li>Drop support for Ubuntu 23.10 and older. In order to have less burdain of maintencne, we only support the latest LTS of Ubuntu, which currently is 24.04 (#1607)</li>
</ul>
</description>
</release>
Expand Down
3 changes: 1 addition & 2 deletions scripts/install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 \
Expand Down

0 comments on commit 4f3ad7f

Please sign in to comment.