Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 actions/build_fuzzers/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ inputs:
required: false
runs:
using: 'docker'
image: 'docker://gcr.io/oss-fuzz-base/clusterfuzzlite-build-fuzzers:v1'
image: 'docker://gcr.io/oss-fuzz-base/clusterfuzzlite-build-fuzzers:ubuntu-24-04-v1'
Copy link
Contributor

Choose a reason for hiding this comment

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

FWIW I'm not sure how safe it is to change it here. As far as I can remember the v1 tag used by projects using CFLite was updated automatically and I don't think it should start pointing at these versions automatically (because it can just break stuff that doesn't work with Ubuntu 24.04 yet. For example avahi fails under MSan on Ubuntu 24.04 (avahi/avahi#787) so I'd keep Ubuntu 20.04 there for now).

(If it doesn't affect the v1 tag and another tag is going to be added instead it should be fine of course)

Copy link
Contributor

Choose a reason for hiding this comment

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

Just to clarify I mean https://github.com/google/clusterfuzzlite/tags and things like

google/clusterfuzzlite/actions/build_fuzzers@v1

used in actions https://google.github.io/clusterfuzzlite/running-clusterfuzzlite/github-actions/#pr-fuzzing.

Projects pulling main instead of v1 probably know what they're doing so they probably should be fine with breaking changes.

Copy link
Author

Choose a reason for hiding this comment

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

I understand your concern. The plan here is to re-release v1 specifically with the fix from google/oss-fuzz#14388. The default fallback behavior will remain ubuntu-20-04. So, unless someone explicitly changes base_os_version to ubuntu-24-04 in project.yaml, it will continue running on ubuntu-20-04. We can set the default to ubuntu-24-04 in v2 (or on the main branch) once the migration is complete.

Copy link
Collaborator

Choose a reason for hiding this comment

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

I'm also worried about this, but your explanation makes sense.

Copy link
Contributor

Choose a reason for hiding this comment

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

Agreed. It makes sense. I guess I thought that it would start pulling ubuntu-24-04 left and right but it isn't the case. As long as ubuntu-20-04 is used by default it should be fine then.

env:
ALLOWED_BROKEN_TARGETS_PERCENTAGE: ${{ inputs.allowed-broken-targets-percentage}}
BAD_BUILD_CHECK: ${{ inputs.bad-build-check }}
Expand Down
2 changes: 1 addition & 1 deletion actions/run_fuzzers/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ inputs:
default: true
runs:
using: 'docker'
image: 'docker://gcr.io/oss-fuzz-base/clusterfuzzlite-run-fuzzers:v1'
image: 'docker://gcr.io/oss-fuzz-base/clusterfuzzlite-run-fuzzers:ubuntu-24-04-v1'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this change safe to make? Or do we pivot back to 20 if they aren't opting into 24?

env:
FUZZ_SECONDS: ${{ inputs.fuzz-seconds }}
MODE: ${{ inputs.mode }}
Expand Down