8000 BUG: Adjust shallow clone in the gitpod container by trallard · Pull Request #19119 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

BUG: Adjust shallow clone in the gitpod container #19119

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 2 commits into from
May 28, 2021
Merged

BUG: Adjust shallow clone in the gitpod container #19119

merged 2 commits into from
May 28, 2021

Conversation

trallard
Copy link
Contributor
@trallard trallard commented May 27, 2021 •
edited
Loading

Closes #19103

setup.py was recently updated to better identify the tags through versioneer (see #19096) which meant the previous shallow clone in the Gitpod Docker container was no longer compatible with how tags are handled

Replacing --depth=1 with --depth=20 works well enough to fix the issue and still keep the clone shallow enough to not bloat the image

8000
@charris
Copy link
Member
charris commented May 27, 2021 •
edited
Loading

I think that 20 is still too shallow, 50 didn't work with the nightly wheels for 1.21.0. Note that the needed tag only dates to last Saturday, for which 20 barely suffices. The other problem with depth is that it is hard to determine precisely how much is taken, it depends on merges and such. For the true minimum needed you could use the date on which the tag was added; --shallow-since=2021-05-22.

@trallard
Copy link
Contributor Author

That makes sense - adjusted now.

I was going for the minimum to build since the NumPy build in the container is basically to leverage the use of cache. Since when Gitpod creates a new workspace it makes a fresh clone and builds again - but since we already did a quick build in Docker this should take way less time.

Anyway, this should be all ready to go, thanks for all the insights @charris

@charris
Copy link
Member
charris commented May 28, 2021

The test failures are unrelated. I still haven't managed to figure out how to interpret git 'revisions'. AFAICT, depth goes down all the reachable branches to that many revisions, but even with that I can't figure where it ends in the main branch. Maybe the merged branches provide shortcuts to where they started in the main branch.

@charris charris merged commit ca28804 into numpy:main May 28, 2021
@charris
Copy link
Member
charris commented May 28, 2021 •
edited
Loading

Thanks Tania.

@charris
Copy link
Member
charris commented May 28, 2021

Hmm, this failed, but differently

#12 0.350 error: Could not read 3c6a2f8b95a8a673821f4f061ec5ff9615cfdfef
#12 0.350 fatal: Failed to traverse parents of commit ca2880476f2f0f9ff3ba4ca0889ac9911727be9b

The second hash is this commit, the first is the last commit before this. I wonder if the gitpod repo was current?

@charris
Copy link
Member
charris commented May 28, 2021

The .gitpod.yml file has the master branch enabled. Should it be main?

@charris charris mentioned this pull request May 28, 2021
Merged
@charris
Copy link
Member
charris commented May 28, 2021

I've made another fix, see #19132.

@WarrenWeckesser WarrenWeckesser mentioned this pull request Jan 24, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
00 - Bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

gitpod build is failing after merging a PR
2 participants
@trallard @charris
0