Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to glibc2.31 for Linux builds #1967

Merged
merged 3 commits into from
Oct 30, 2024
Merged

Upgrade to glibc2.31 for Linux builds #1967

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d56f0
Upgrade to glibc2.31 for Linux builds
t3chguy Oct 29, 2024
18703e9
Update glibc version check
t3chguy Oct 29, 2024
ab608af
Specify libc version in deb pre-depends
t3chguy Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_linux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
./scripts/glibc-check.sh $filename
done
env:
MAX_VER: 2.28 # buster-era glibc
MAX_VER: 2.31 # bullseye-era glibc

build:
needs: hak
Expand Down
5 changes: 3 additions & 2 deletions dockerbuild/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Docker image to facilitate building Element Desktop's native bits using a glibc version with broader compatibility
FROM rust:buster
# Docker image to facilitate building Element Desktop's native bits using a glibc version (2.31)
# with broader compatibility, down to Debian bullseye & Ubuntu focal.
FROM rust:bullseye

ENV DEBIAN_FRONTEND noninteractive

Expand Down
2 changes: 2 additions & 0 deletions electron-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,8 @@ const config: Writable<Configuration> = {
"Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)",
"--deb-field",
"Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)",
"--deb-pre-depends",
"libc6 (>= 2.31)",
],
},
mac: {
Expand Down
Loading