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
Fix selection of manylinux to build #2805
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,87 +1,101 @@ | ||
| REPO_ROOT = $(abspath ../..) | ||
|
|
||
| wheels-manylinux-x64: | ||
| wheels-manylinux1-x64: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux1_base_x86_64 /io/buildconfig/manylinux-build/build-wheels.sh | ||
|
|
||
| wheels-manylinux-x86: | ||
| wheels-manylinux1-x86: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux1_base_i686 /io/buildconfig/manylinux-build/build-wheels.sh | ||
|
|
||
| wheels-x64: | ||
| wheels-manylinux2010-x64: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux2010_base_x86_64 /io/buildconfig/manylinux-build/build-wheels.sh buildpypy | ||
|
|
||
| wheels-x86: | ||
| wheels-manylinux2010-x86: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux2010_base_i686 /io/buildconfig/manylinux-build/build-wheels.sh buildpypy | ||
|
|
||
| wheels-aarch64: | ||
| wheels-manylinux2014-x64: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux2014_base_x86_64 /io/buildconfig/manylinux-build/build-wheels.sh buildpypy | ||
|
|
||
| wheels-manylinux2014-x86: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux2014_base_i686 /io/buildconfig/manylinux-build/build-wheels.sh buildpypy | ||
|
|
||
| wheels-manylinux2014-aarch64: | ||
| docker run --rm -v ${REPO_ROOT}:/io pygame/manylinux2014_base_aarch64 /io/buildconfig/manylinux-build/build-wheels.sh | ||
|
|
||
| wheels: wheels-x64 wheels-x86 wheels-aarch64 | ||
| wheels-manylinux: wheels-manylinux-x64 wheels-manylinux-x86 | ||
| wheels: wheels-manylinux1-x64 wheels-manylinux1-x86 wheels-manylinux2010-x64 wheels-manylinux2010-x86 wheels-manylinux2014-x64 wheels-manylinux2014-x86 wheels-manylinux2014-aarch64 | ||
|
|
||
|
|
||
|
|
||
| base-image-manylinux-x64: | ||
| base-image-manylinux1-x64: | ||
| docker build --build-arg BASE_IMAGE=manylinux1_x86_64 --build-arg BASE_IMAGE2=manylinux1_x86_64 -t pygame/manylinux1_base_x86_64 -f docker_base/Dockerfile-x86_64 docker_base | ||
|
|
||
| base-image-manylinux-x86: | ||
| base-image-manylinux1-x86: | ||
| docker build --build-arg BASE_IMAGE=manylinux1_i686 --build-arg BASE_IMAGE2=manylinux1_i686 -t pygame/manylinux1_base_i686 -f docker_base/Dockerfile-i686 docker_base | ||
|
|
||
| base-images-manylinux: base-image-manylinux-x64 base-image-manylinux-x86 | ||
|
|
||
|
|
||
| base-image-manylinux2010-x64: | ||
| docker build -t pygame/manylinux2010_base_x86_64 -f docker_base/Dockerfile-x86_64 docker_base --build-arg BASE_IMAGE=manylinux2010_x86_64 --build-arg BASE_IMAGE2=manylinux2010_x86_64 --progress=plain | ||
|
|
||
| base-image-x64: | ||
| docker build -t pygame/manylinux2010_base_x86_64 -f docker_base/Dockerfile-x86_64 docker_base --build-arg BASE_IMAGE=manylinux2010_x86_64 --build-arg BASE_IMAGE2=manylinux2010_x86_64 | ||
|
|
||
| base-image-x86: | ||
| base-image-manylinux2010-x86: | ||
| docker build -t pygame/manylinux2010_base_i686 -f docker_base/Dockerfile-i686 docker_base --build-arg BASE_IMAGE=manylinux2010_i686 --build-arg BASE_IMAGE2=manylinux2010_i686 | ||
|
|
||
| base-image-aarch64: | ||
| docker build -t pygame/manylinux2014_base_aarch64 -f docker_base/Dockerfile-aarch64 docker_base --build-arg BASE_IMAGE=manylinux2014_aarch64 --build-arg BASE_IMAGE2=manylinux2014_aarch64 | ||
|
|
||
| base-images: base-image-x64 base-image-x86 base-image-aarch64 | ||
|
|
||
| base-image-manylinux2014-x64: | ||
| docker build -t pygame/manylinux2014_base_x86_64 -f docker_base/Dockerfile-x86_64 docker_base --build-arg BASE_IMAGE=manylinux2014_x86_64 --build-arg BASE_IMAGE2=manylinux2014_x86_64 --progress=plain | ||
|
|
||
| base-image-manylinux2014-x86: | ||
| docker build -t pygame/manylinux2014_base_i686 -f docker_base/Dockerfile-i686 docker_base --build-arg BASE_IMAGE=manylinux2014_i686 --build-arg BASE_IMAGE2=manylinux2014_i686 | ||
|
|
||
| base-image-manylinux2014-aarch64: | ||
| docker build -t pygame/manylinux2014_base_aarch64 -f docker_base/Dockerfile-aarch64 docker_base --build-arg BASE_IMAGE=manylinux2014_aarch64 --build-arg BASE_IMAGE2=manylinux2014_aarch64 | ||
|
|
||
| push-manylinux-x64: | ||
| docker push pygame/manylinux1_base_x86_64 | ||
| # base-images: base-image-manylinux1-x64 base-image-manylinux1-x86 base-image-manylinux2010-x64 base-image-manylinux2010-x86 base-image-manylinux2014-x64 base-image-manylinux2014-x86 base-image-aarch64 | ||
| base-images: base-image-manylinux2010-x64 base-image-manylinux2010-x86 base-image-manylinux2014-x64 base-image-manylinux2014-x86 base-image-manylinux2014-aarch64 | ||
|
|
||
| push-manylinux-x86: | ||
| docker push pygame/manylinux1_base_i686 | ||
|
|
||
| push-manylinux: push-manylinux-x64 push-manylinux-x86 | ||
| # push-manylinux1-x64: | ||
| # docker push pygame/manylinux1_base_x86_64 | ||
|
|
||
| # push-manylinux1-x86: | ||
| # docker push pygame/manylinux1_base_i686 | ||
|
|
||
| push-x64: | ||
| push-manylinux2010-x64: | ||
| docker push pygame/manylinux2010_base_x86_64 | ||
|
|
||
| push-x86: | ||
| push-manylinux2010-x86: | ||
| docker push pygame/manylinux2010_base_i686 | ||
|
|
||
| push-aarch64: | ||
| push-manylinux2014-x64: | ||
| docker push pygame/manylinux2014_base_x86_64 | ||
|
|
||
| push-manylinux2014-x86: | ||
| docker push pygame/manylinux2014_base_i686 | ||
|
|
||
| push-manylinux2014-aarch64: | ||
| docker push pygame/manylinux2014_base_aarch64 | ||
|
|
||
| push: push-x64 push-x86 push-aarch64 | ||
|
|
||
| # push: push-manylinux1-x64 push-manylinux1-x86 push-manylinux2010-x64 push-manylinux2010-x86 push-manylinux2014-x64 push-manylinux2014-x86 | ||
| push: push-manylinux2010-x64 push-manylinux2010-x86 push-manylinux2014-x64 push-manylinux2014-x86 push-manylinux2014-aarch64 | ||
|
|
||
|
|
||
|
|
||
| pull-manylinux-x64: | ||
| pull-manylinux1-x64: | ||
| docker pull pygame/manylinux1_base_x86_64 | ||
|
|
||
| pull-manylinux-x86: | ||
| pull-manylinux1-x86: | ||
| docker pull pygame/manylinux1_base_i686 | ||
|
|
||
| pull-manylinux: pull-manylinux-x64 pull-manylinux-x86 | ||
| pull-manylinux2010-x64: | ||
| docker pull pygame/manylinux1_base_x86_64 | ||
|
|
||
| pull-manylinux2010-x86: | ||
| docker pull pygame/manylinux2010_base_i686 | ||
|
|
||
| pull-x64: | ||
| docker pull pygame/manylinux2010_base_x86_64 | ||
| pull-manylinux2014-x64: | ||
| docker pull pygame/manylinux1_base_x86_64 | ||
|
|
||
| pull-x86: | ||
| pull-manylinux2014-x86: | ||
| docker pull pygame/manylinux2010_base_i686 | ||
|
|
||
| pull-aarch64: | ||
| pull-manylinux2014-aarch64: | ||
| docker pull pygame/manylinux2014_base_aarch64 | ||
|
|
||
| pull: pull-x64 pull-x86 pull-aarch64 | ||
| pull: pull-manylinux1-x64 pull-manylinux1-x86 pull-manylinux2010-x64 pull-manylinux2010-x86 pull-manylinux2014-x64 pull-manylinux2014-x86 pull-manylinux2014-aarch64 | ||
| # pull: pull-manylinux2010-x64 pull-manylinux2010-x86 pull-manylinux2014-x64 pull-manylinux2014-x86 pull-aarch64 |
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor nitpick here, maybe the leading and trailing hyphen
-must not be in thematrix.tagrather it can come a few lines below, wheremake pull${{ matrix.tag }}${{ matrix.arch }} wheels${{ matrix.tag }}${{ matrix.arch }}should becomemake pull-${{ matrix.tag }}-${{ matrix.arch }} wheels-${{ matrix.tag }-}${{ matrix.arch }}This is so that the build name looks neater :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point. I'll fix that after the release :)