Skip to content
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

Replace SVN with Git for installing extra test images #6918

Merged
merged 13 commits into from
Feb 10, 2023

Conversation

hugovk
Copy link
Member

@hugovk hugovk commented Jan 28, 2023

GitHub is removing support for Subversion on January 8, 2024.

Why do we care?

Well, we're using svn in our CI to extract only the test_images directory 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

.github/workflows/test-cygwin.yml Show resolved Hide resolved
.github/workflows/test-mingw.yml Outdated Show resolved Hide resolved
@radarhere radarhere mentioned this pull request Jan 31, 2023
@hugovk hugovk marked this pull request as ready for review January 31, 2023 09:35
@hugovk hugovk added the Cleanup label Jan 31, 2023
hugovk and others added 2 commits February 4, 2023 10:04
Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com>
@radarhere
Copy link
Member

I've created hugovk#93 with some further suggestions.

@radarhere radarhere merged commit 4ab4bfe into python-pillow:main Feb 10, 2023
@hugovk hugovk deleted the rm-svn branch February 10, 2023 09:28
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants