Skip to content

Conversation

@tklauser
Copy link
Contributor

@tklauser tklauser commented Jul 31, 2025

The intent of the step was that libsframe1 should be installed when
running the workflow on the ubuntu-24.04 runner. However, the condition
mistakenly checks for the step being run on the ubuntu-20.04 runner,
so it's currently a no-op. The workflow passed without this step being
run. Thus, we can assume libsframe1 was installed as a transitive
dependency in the previous step and the libsframe installation step can
be removed altogether.

Fixes: 6180da5 ("ci: Add Ubuntu 24.04 runner (with ugly hack for static libbfd)")

@tklauser
Copy link
Contributor Author

/cc @qmonnet

@tklauser
Copy link
Contributor Author

tklauser commented Jul 31, 2025

From the run of the workflow on this PR (https://github.com/libbpf/bpftool/actions/runs/16645056306/job/47103644692?pr=207#step:4:11) it looks like libsframe1 is already installed as a transitive dependency, so maybe we could just top the step altogether?

@qmonnet
Copy link
Member

qmonnet commented Jul 31, 2025

😱 Good catch, thank you!

it looks like libsframe1 is already installed as a transitive dependency

Yes, I wouldn't have managed to merge the change otherwise. But I hadn't realise it was already present.

so maybe we could just top the step altogether?

Yes, please! Let's just remove it

The intent of the step was that libsframe1 should be installed when
running the workflow on the ubuntu-24.04 runner. However, the condition
mistakenly checks for the step being run on the ubuntu-20.04 runner,
so it's currently a no-op. The workflow passed without this step being
run. Thus, we can assume libsframe1 was installed as a transitive
dependency in the previous step and the libsframe installation step can
be removed altogether.

Fixes: 6180da5 ("ci: Add Ubuntu 24.04 runner (with ugly hack for static libbfd)")

Signed-off-by: Tobias Klauser <[email protected]>
@tklauser
Copy link
Contributor Author

so maybe we could just top the step altogether?

Yes, please! Let's just remove it

Done and updated commit message/PR description.

@tklauser tklauser changed the title ci: fix condition for libsframe installation on Ubuntu 24.04+ ci: drop libsframe installation step Jul 31, 2025
@qmonnet
Copy link
Member

qmonnet commented Jul 31, 2025

Sorry, did you forget to update the commit? It's still the same on my side (update 20.04 -> 24.04)

@tklauser tklauser force-pushed the ci-ubuntu-fix-libsframe-install branch from 3c0cf2a to fe42b42 Compare July 31, 2025 10:47
@tklauser
Copy link
Contributor Author

tklauser commented Jul 31, 2025

🤦 Sorry, I wrote the comment and updated the PR description but forgot to push the actual commit. Done now.

Copy link
Member

@qmonnet qmonnet 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 🥰

@qmonnet qmonnet merged commit 795f4a8 into libbpf:main Jul 31, 2025
4 checks passed
@tklauser tklauser deleted the ci-ubuntu-fix-libsframe-install branch July 31, 2025 11:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants