Thanks to visit codestin.com
Credit goes to github.com

Skip to content

For modern GCC CI, replace (broken) openSUSE Tumbleweed by Ubuntu 25.04 (fixes #656) #662

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
Merged
Cropi merged 2 commits into from
Apr 28, 2025
Merged

For modern GCC CI, replace (broken) openSUSE Tumbleweed by Ubuntu 25.04 (fixes #656) #662

Cropi merged 2 commits into from
Apr 28, 2025

Conversation

@hartwork
Copy link
Contributor

@hartwork hartwork commented Apr 25, 2025 •
edited
Loading

Fixes #656

CC @Cropi

PS:

# diff -u0 scripts/docker/build_on_ubuntu_{22,25}_04.Dockerfile
--- scripts/docker/build_on_ubuntu_22_04.Dockerfile     2023-06-06 21:34:38.936688847 +0200
+++ scripts/docker/build_on_ubuntu_25_04.Dockerfile     2025-04-26 00:13:05.216011345 +0200
@@ -2 +2 @@
-## Copyright (c) 2022 Sebastian Pipping <[email protected]>
+## Copyright (c) 2025 Sebastian Pipping <[email protected]>
@@ -17 +17 @@
-FROM ubuntu:22.04
+FROM ubuntu:25.04
@@ -28,0 +29,2 @@
+            g++-15 \
+            gcc-15 \
@@ -46 +48 @@
-            systemd \
+            systemd-dev \
@@ -52 +54 @@
-RUN ./configure --enable-systemd || ! cat config.log
+RUN ./configure --enable-systemd CC=gcc-15 CXX=g++-15 || ! cat config.log
@@ -58 +60 @@
-RUN ../configure --enable-systemd || ! cat config.log
+RUN ../configure --enable-systemd CC=gcc-15 CXX=g++-15 || ! cat config.log

Cropi
Cropi approved these changes Apr 28, 2025
View reviewed changes
Copy link
Member

@Cropi Cropi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@Cropi Cropi merged commit e7969ed into USBGuard:main Apr 28, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Cropi Cropi Cropi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

openSUSE CI is broken for 3 weeks now

2 participants

@hartwork @Cropi