ci: Move testing into ubuntu:26.04 containers for OpenSSL 3.5#587
Merged
Conversation
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
📝 WalkthroughWalkthroughCI workflow jobs for Ubuntu builds and coveralls now run in ubuntu:26.04 containers, add conditional dependency installation when ChangesCI environment upgrade to Ubuntu 26.04 containers
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~20 minutes Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
stefanberger
force-pushed
the
stefanberger/ubuntu-26.04
branch
from
7c77122 to
04405d0
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.github/workflows/ci.yml:
- Line 54: The CI step uses a blocking package install command "sudo apt install
git" which will hang in non-interactive runs; update the command invocation to
run non-interactively by adding the assume-yes flag (e.g., change "sudo apt
install git" to include "-y") or use a non-interactive apt-get approach (e.g.,
"DEBIAN_FRONTEND=noninteractive apt-get install -y git") so the workflow never
prompts for confirmation.
- Around line 53-54: Ensure the package cache is always updated before
installing git: change the workflow shell logic so that you still check/ensure
sudo exists (the existing "if ! type -P sudo; then apt-get -y update && apt-get
-y install sudo; fi" behavior) but always run "apt-get update" (with sudo if
present) prior to "apt install git" -- e.g., after ensuring sudo, invoke "sudo
apt-get update" then "sudo apt-get install -y git" so git installation won't
fail in images where sudo already exists.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
Comment on lines
+53
to
+54
| if ! type -P sudo; then apt-get -y update && apt-get -y install sudo; fi | ||
| sudo apt install git |
There was a problem hiding this comment.
Missing apt-get update when sudo already exists.
The current logic only runs apt-get update if sudo is missing (line 53), but git installation (line 54) executes unconditionally. In a fresh ubuntu:26.04 container where sudo is already present, the package cache will be stale or empty, causing the git installation to fail.
🔧 Proposed fix
- if ! type -P sudo; then apt-get -y update && apt-get -y install sudo; fi
- sudo apt install git
+ if ! type -P sudo; then apt-get -y update && apt-get -y install sudo; fi
+ sudo apt-get -y update
+ sudo apt-get -y install git📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| if ! type -P sudo; then apt-get -y update && apt-get -y install sudo; fi | |
| sudo apt install git | |
| if ! type -P sudo; then apt-get -y update && apt-get -y install sudo; fi | |
| sudo apt-get -y update | |
| sudo apt-get -y install git |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In @.github/workflows/ci.yml around lines 53 - 54, Ensure the package cache is
always updated before installing git: change the workflow shell logic so that
you still check/ensure sudo exists (the existing "if ! type -P sudo; then
apt-get -y update && apt-get -y install sudo; fi" behavior) but always run
"apt-get update" (with sudo if present) prior to "apt install git" -- e.g.,
after ensuring sudo, invoke "sudo apt-get update" then "sudo apt-get install -y
git" so git installation won't fail in images where sudo already exists.
04405d0 to
2f4264f
Compare
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.github/workflows/ci.yml:
- Around line 53-56: The container branch of the CI step (the if ! type -P sudo;
then block) installs autotools but omits compiler and dev libs needed for
configure/make; update that apt-get -y install line (or add a follow-up apt-get
install) to include build-essential (or gcc/g++/make), libssl-dev and pkg-config
(and optionally libffi-dev) so commands like ./configure --with-openssl and make
succeed.
- Around line 27-29: The ubuntu:26.04 container used in the job (container:
image: ubuntu:26.04) lacks build dependencies required by autogen.sh and make
distcheck; add a step before running autogen.sh/make distcheck to run apt-get
update and install automake, autoconf, libtool, build-essential (gcc/g++/make),
pkg-config and libssl-dev (or the equivalent distro packages) so the build tools
are available in the container; update the CI job to run a setup step (e.g.,
"Install build dependencies") that executes apt-get install -y automake autoconf
libtool build-essential pkg-config libssl-dev and any needed prerequisites
before invoking autogen.sh and make distcheck.
- Around line 9-11: CI container jobs using container.image: ubuntu:26.04
(notably build-ubuntu-jammy, build-ubuntu-noble and build-coveralls) are missing
required build deps before running ./autogen.sh; update each job to install the
toolchain and libraries prior to invoking ./autogen.sh (or use a prebuilt image)
— at minimum apt-get install build-essential pkg-config libssl-dev automake
autoconf libtool (and ensure gcc/g++/make are present) so autoreconf/AC_PROG_CC
and the --with-openssl configure checks succeed.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
stefanberger
force-pushed
the
stefanberger/ubuntu-26.04
branch
7 times, most recently
from
adee1d8 to
78add37
Compare
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.github/workflows/ci.yml:
- Around line 8-11: Two jobs share the same job id build-ubuntu-resolute causing
one to be dropped; rename one of the duplicate job ids to a unique identifier
(e.g., build-ubuntu-resolute-26-04 or build-ubuntu-resolute-autogen2) and update
any references to that job (needs/depends-on) so workflow validation succeeds
and both Ubuntu 26.04 autogen.sh variants run; ensure the container:image
ubuntu:26.04 job block remains otherwise unchanged.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
stefanberger
force-pushed
the
stefanberger/ubuntu-26.04
branch
11 times, most recently
from
8682881 to
193cc13
Compare
Since swtpm now needs OpenSSL 3.5, move the testing into ubuntu:26.04 containers. Several basic dev packages need to be installed for a container to be able to build. Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
stefanberger
force-pushed
the
stefanberger/ubuntu-26.04
branch
from
193cc13 to
34e9547
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Since swtpm now needs OpenSSL 3.5, move the testing into ubuntu:26.04 containers.
Summary by CodeRabbit