Skip to content

Commit 5b43784

Browse files
nschimmeprobonopd
andauthored
Allow Jammy Jellyfish builds (#633)
Allow Jammy Jellyfish builds Focal Fossa support ends on May 31st, 2025 Co-authored-by: probonopd <[email protected]>
1 parent 0448055 commit 5b43784

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
44
jobs:
55
build:
66
name: Build
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
container: ubuntu:xenial
99
env:
1010
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

tools/linuxdeployqt/main.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,11 @@ int main(int argc, char **argv)
211211
// Ubuntu Xenial Xerus (16.04) uses glibc 2.23
212212
// Ubuntu Bionic Beaver (18.04) uses glibc 2.27
213213
// Ubuntu Focal Fossa (20.04) uses glibc 2.31
214-
if (strverscmp (glcv, "2.32") >= 0) {
214+
// Ubuntu Jammy Jellyfish (22.04) uses glibc 2.35
215+
if (strverscmp (glcv, "2.36") >= 0) {
215216
qInfo() << "ERROR: The host system is too new.";
216217
qInfo() << "Please run on a system with a glibc version no newer than what comes with the oldest";
217-
qInfo() << "currently supported mainstream distribution (Ubuntu Focal Fossa), which is glibc 2.31.";
218+
qInfo() << "currently supported mainstream distribution (Ubuntu Jammy Jellyfish), which is glibc 2.35.";
218219
qInfo() << "This is so that the resulting bundle will work on most still-supported Linux distributions.";
219220
qInfo() << "For more information, please see";
220221
qInfo() << "https://github.com/probonopd/linuxdeployqt/issues/340";

0 commit comments

Comments
 (0)