chore(oss-fuzz): sync in-tree staging files with upstream PR #15545#49
Merged
Merged
Conversation
The OSS-Fuzz upstream PR (google/oss-fuzz#15545) needed Apache 2.0 license headers on Dockerfile and build.sh per `dpebot`'s header-check bot — that's the convention for everything under projects/ in the google/oss-fuzz repo. The bot only flagged build.sh, but the Dockerfile needs one too (sampled aiohttp / vlc / curl all carry the same Apache + 80-# separator on both files). This PR brings the three in-tree staging files at .github/oss-fuzz/ to byte-equivalence with what's now in the upstream PR branch, so a future contributor can `cp` either direction without a diff-and-fix step. Concrete changes: - Dockerfile: prepended the standard Google LLC Apache 2.0 header + 80-# separator block. The "build container for the GayHydra decompiler harnesses" comment moves below the separator. - build.sh: same header treatment, after the `#!/bin/bash -eu` shebang. - project.yaml: replaced the in-tree-specific "To go live: copy this file" preamble (which doesn't make sense once at upstream) with the contextual comment that's in the upstream copy. The "what gets copied where" guidance moves to the new README.md. - README.md (new): describes the staging directory's purpose, links to OSS_FUZZ.md and to the upstream destination, and records the sync workflow so the next person editing in either location keeps them aligned. Upstream PR #15545 status: header-check now passes, cla/google passes, check-changes passes; the build / zizmor / trial-build jobs are skipped while the PR is still in draft. Proudly Made in Nebraska. Go Big Red! 🌽 https://xkcd.com/2347/ Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
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.
The OSS-Fuzz upstream PR (google/oss-fuzz#15545) needed Apache 2.0 license headers on
Dockerfileandbuild.shperdpebot'sheader-checkbot — that's the convention for everything underprojects/in the google/oss-fuzz repo. The bot only flaggedbuild.sh, but the Dockerfile needs one too (sampled aiohttp / vlc / curl all carry the same Apache + 80-#separator on both files).This PR brings the three in-tree staging files at
.github/oss-fuzz/to byte-equivalence with what's now in the upstream PR branch, so a future contributor cancpeither direction without a diff-and-fix step.Concrete changes:
Dockerfile: prepended the standardGoogle LLCApache 2.0 header + 80-#separator block. The "build container for the GayHydra decompiler harnesses" comment moves below the separator.build.sh: same header treatment, after the#!/bin/bash -eushebang.project.yaml: replaced the in-tree-specific "To go live: copy this file" preamble (which doesn't make sense once at upstream) with the contextual comment that's in the upstream copy. The "what gets copied where" guidance moves to the newREADME.md.README.md(new): describes the staging directory's purpose, links toOSS_FUZZ.mdand to the upstream destination, and records the sync workflow so the next person editing in either location keeps them aligned.Upstream PR #15545 status:
header-checknow passes,cla/googlepasses,check-changespasses; thebuild/zizmor/trial-buildjobs are skipped while the PR is still in draft.Proudly Made in Nebraska. Go Big Red! 🌽 https://xkcd.com/2347/