-
Notifications
You must be signed in to change notification settings - Fork 1.8k
build: remove buster, replace with bullseye when necessary #10908
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.
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
base: master
Are you sure you want to change the base?
Conversation
patrick-stephens
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would disable the build but not remove the option for folks to build, I know it's eol but that's not the same as no one uses it (look at Centos). We can just remove it from all the CI but leave the container definition I think.
Does this suffice? |
| echo '{ "distro" : [' | ||
| echo '"amazonlinux/2", "amazonlinux/2.arm64v8",' | ||
| echo '"centos/7", "centos/7.arm64v8", "centos/8", "centos/8.arm64v8",' | ||
| echo '"debian/buster", "debian/buster.arm64v8", "debian/bullseye", "debian/bullseye.arm64v8",' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to change this, it's only for 1.9 and earlier builds
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted
| # Use buildkit to skip unused base images: DOCKER_BUILDKIT=1 | ||
|
|
||
| FROM balenalib/rpi-raspbian:buster AS raspbian-buster-base | ||
| FROM balenalib/rpi-raspbian:bullseye AS raspbian-bullseye-base |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is actually changing the Raspbian build, I'm not sure we want that as it's not Debian per-se. Not sure why we jumped from buster to bookworm for Raspbian but that's not part of this change.
Please make sure you're not just globally changing any reference to the string.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted.
| @@ -1,11 +1,11 @@ | |||
| # For staging upgrade we use the 'official-install' as the base | |||
| ARG STAGING_BASE=docker.io/dokken/debian-10 | |||
| ARG STAGING_BASE=docker.io/dokken/debian-11 | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Again, this is a change that is confusing as the file we are in here is called .debian10, I think it's been a global search-and-replace when instead we should also rename the file to be clear and accurate.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, this was a mistake and I have reverted this.
Yes. It was a global search-and-replace. I wasn't sure if this file is still needed, so I have not removed it and just reverted my wrong change.
3a514d9 to
6304625
Compare
|
None of failing tests are related to this PR. |
6304625 to
586e9b3
Compare
WalkthroughUpdated CI workflows to use Debian Bullseye instead of Buster and removed Buster targets/entries from packaging configuration and documentation across packaging files. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Files are few and changes are homogeneous (container image/name updates and removals). Pay quick attention to workflow names and any remaining references to Possibly related PRs
Suggested reviewers
Poem
Pre-merge checks and finishing touches✅ Passed checks (3 passed)
✨ Finishing touches
🧪 Generate unit tests (beta)
📜 Recent review detailsConfiguration used: CodeRabbit UI Review profile: CHILL Plan: Pro 📒 Files selected for processing (8)
💤 Files with no reviewable changes (3)
🚧 Files skipped from review as they are similar to previous changes (1)
🔇 Additional comments (4)
Tip 📝 Customizable high-level summaries are now available in beta!You can now customize how CodeRabbit generates the high-level summary in your pull requests — including its content, structure, tone, and formatting.
Example instruction:
Note: This feature is currently in beta for Pro-tier users, and pricing will be announced later. 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 |
|
@patrick-stephens can you approve this to get it merged? Docs PR fluent/fluent-bit-docs#2068 ready to go. |
src/wamrc/CMakeLists.txt
Outdated
| DESTINATION "${FLB_INSTALL_BINDIR}") | ||
| endif() | ||
| endif () | ||
| endif () |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should not be changing this, it's a vendored dependency so unrelated to this change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm pretty sure this is vim vs vscode default behvaiour with newline, I didn't intend to change this :)
I'll revert this.
694466f to
8513540
Compare
|
@aminvakil can you update your commits to match the required contribution style (or squash them) |
Signed-off-by: Amin Vakil <[email protected]>
8513540 to
4b93f59
Compare
cosmo0920
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We'll modify cfl, cmetrics, cprofiles, and ctraces in each of repositories.
So, in this PR, we shouldn't modify them directly.
| name: Debian Buster build to confirm no issues once used downstream | ||
| name: Debian Bullseye build to confirm no issues once used downstream | ||
| runs-on: ubuntu-latest | ||
| container: debian:buster | ||
| container: debian:bullseye |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You shouldn't modify under lib sources. This should be modified in each of upstream repos.
| name: Debian Buster build to confirm no issues once used downstream | ||
| name: Debian Bullseye build to confirm no issues once used downstream | ||
| runs-on: ubuntu-latest | ||
| container: debian:buster | ||
| container: debian:bullseye |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto.
| name: Debian Buster build to confirm no issues once used downstream | ||
| name: Debian Bullseye build to confirm no issues once used downstream | ||
| runs-on: ubuntu-latest | ||
| container: debian:buster | ||
| container: debian:bullseye |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto.
| name: Debian Buster build to confirm no issues once used downstream | ||
| name: Debian Bullseye build to confirm no issues once used downstream | ||
| runs-on: ubuntu-latest | ||
| container: debian:buster | ||
| container: debian:bullseye |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto.
It's been three years since buster does not gets updated from Debian Security Team and it's been a year since Debian LTS Team does not support that either.
Now that
trixiehas been added as well to this repository, I've removed allbustertests.There were also some tests which only were tested on
buster, I've changed them tobullseyefor now to expect minimum changes, and I'm going to change them totrixiewith is Debianstablenow.Enter `` in the box, if an item is not applicable to your change.
Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
fluent/fluent-bit-docs#2068
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.
Summary by CodeRabbit
Chores
Documentation
✏️ Tip: You can customize this high-level summary in your review settings.