Replace SVN with Git for installing extra test images #6918
Conversation
This file contains 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
hugovk
commented
Jan 28, 2023
Merged
radarhere
reviewed
Jan 31, 2023
radarhere
reviewed
Feb 3, 2023
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
radarhere
reviewed
Feb 7, 2023
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
|
I've created hugovk#93 with some further suggestions. |
radarhere
approved these changes
Feb 10, 2023
DavidKorczynski
pushed a commit
to google/oss-fuzz
that referenced
this pull request
Feb 11, 2023
Over at python-pillow, our CIFuzz job has [started failing](https://github.com/python-pillow/Pillow/actions/runs/4147683686/jobs/7174854267#step:4:7800) - > depends/install_extra_test_images.sh: line 6: ./download-and-extract.sh: No such file or directory This is because we recently merged python-pillow/Pillow#6918, which changes `depends/install_extra_test_images.sh` to call `./download-and-extract.sh`, which exists inside [`depends`](https://github.com/python-pillow/Pillow/tree/main/depends). So when https://github.com/google/oss-fuzz/blob/00b08f6592b90d438e113138c64cd4025fbb3bdf/projects/pillow/Dockerfile#L41 runs, it can't find `./download-and-extract.sh`, because it is running from the base Pillow directory. So this PR changes the command to run from inside `depends` instead. Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
eamonnmcmanus
pushed a commit
to eamonnmcmanus/oss-fuzz
that referenced
this pull request
Mar 15, 2023
Over at python-pillow, our CIFuzz job has [started failing](https://github.com/python-pillow/Pillow/actions/runs/4147683686/jobs/7174854267#step:4:7800) - > depends/install_extra_test_images.sh: line 6: ./download-and-extract.sh: No such file or directory This is because we recently merged python-pillow/Pillow#6918, which changes `depends/install_extra_test_images.sh` to call `./download-and-extract.sh`, which exists inside [`depends`](https://github.com/python-pillow/Pillow/tree/main/depends). So when https://github.com/google/oss-fuzz/blob/00b08f6592b90d438e113138c64cd4025fbb3bdf/projects/pillow/Dockerfile#L41 runs, it can't find `./download-and-extract.sh`, because it is running from the base Pillow directory. So this PR changes the command to run from inside `depends` instead. Co-authored-by: Andrew Murray <radarhere@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
GitHub is removing support for Subversion on January 8, 2024.
Why do we care?
Well, we're using
svnin our CI to extract only thetest_imagesdirectory from https://github.com/python-pillow/pillow-depends.https://github.com/python-pillow/pillow-depends is a big repo full of binary files.
For our purposes, I think we're better off moving the test images into their own repo, so we can instead simply download the new repo as a zipball.
I've made a new repo at https://github.com/hugovk/test-images, which is just the relevant directory from https://github.com/python-pillow/pillow-depends, and preserves the Git history (following these instructions).
Let's move that repo into https://github.com/python-pillow. Because I don't have permission to create repos in the org, we need two steps:
@aclark4life I've sent a request to transfer the repo to you. Once you accept, please could you transfer it to https://github.com/python-pillow, and check the usual suspects have admin rights?
Once it's transferred, I'll update the paths in this PR.
Checklist
TODOs)test_imagesdirectory from https://github.com/python-pillow/pillow-depends: Remove test images pillow-depends#41