Skip to content

BLD: fix cirrus wheel upload triggers#22690

Merged
mattip merged 2 commits intonumpy:mainfrom
mattip:cirrus-upload
Dec 2, 2022
Merged

BLD: fix cirrus wheel upload triggers#22690
mattip merged 2 commits intonumpy:mainfrom
mattip:cirrus-upload

Conversation

@mattip
Copy link
Copy Markdown
Member

@mattip mattip commented Nov 30, 2022

Adopt the comments from @andyfaff:

  • totally separate between travis and cirrus upload triggers
  • use the cirrus triggers in the main CI runner file
  • add a trigger for manual builds, as per the comment

@andyfaff: thoughts?

@stefanv
Copy link
Copy Markdown
Contributor

stefanv commented Nov 30, 2022

@mattip Can we add here the cleanups suggested by @eli-schwartz that I made in 1b47584 ?

@mattip
Copy link
Copy Markdown
Member Author

mattip commented Nov 30, 2022

Can we add here the cleanups

Yes. I thought I did. Adding.

@mattip
Copy link
Copy Markdown
Member Author

mattip commented Nov 30, 2022

@stefanv I prefer the bash syntax with the quotes [[ "$NAME" == "name" ]] rather than without [[ $NAME == name ]], if you don't have a strong preference.

@stefanv
Copy link
Copy Markdown
Contributor

stefanv commented Nov 30, 2022

@stefanv I prefer the bash syntax with the quotes [[ "$NAME" == "name" ]] rather than without [[ $NAME == name ]], if you don't have a strong preference.

I don't have any strong preference myself. It was pointed out to me that this is unnecessary, but it does provide consistency across the script, and doesn't cause harm.

@eli-schwartz
Copy link
Copy Markdown

I don't have any strong preference myself. It was pointed out to me that this is unnecessary, but it does provide consistency across the script, and doesn't cause harm.

I do have a preference (skip the quotes) but I originally didn't mention it because, well, I'm not a numpy developer so I will ordinarily never look at, edit, or execute this script. :P

Which is why I took care to point out in the other PR that "to quote or not to quote inside these special brackets" is a stylistic thing and has an effect on the reader's comprehension (to wit: some people feel the quotes help them understand how bash tokenizes it, so they find the quotes helpful)...

... and crucially, that the quotes themselves aren't the cause or solution of the build error.

Since the people who are actually affected by the style used here, either don't care or want the quotes -- it absolutely makes sense to include the quotes in a STY: commit. (But it is STY: and not BUG:)

@mattip mattip changed the title BUILD: fix cirrus wheel upload triggers BLD: fix cirrus wheel upload triggers Nov 30, 2022
@mattip mattip added the 36 - Build Build related PR label Nov 30, 2022
@mattip mattip merged commit 4f52cda into numpy:main Dec 2, 2022
@mattip
Copy link
Copy Markdown
Member Author

mattip commented Dec 2, 2022

self-merging to move this forward. We can keep iterating on this if there are still problems

@andyfaff
Copy link
Copy Markdown
Member

andyfaff commented Dec 2, 2022

@mattip sorry, been busy this week.

@andyfaff
Copy link
Copy Markdown
Member

andyfaff commented Dec 2, 2022

Did you see if a manual push uploaded a wheel?

@mattip
Copy link
Copy Markdown
Member Author

mattip commented Dec 2, 2022

I manually started the CI job and the wheels ended up at https://anaconda.org/scipy-wheels-nightly/numpy/files. ✔️

charris added a commit to charris/numpy that referenced this pull request Dec 2, 2022
Backport of numpy#22650, numpy#22685, numpy#22690. The travisci builds were failing
for the Python 3.8 builds, so use cirrus instead.
@mattip mattip deleted the cirrus-upload branch December 27, 2022 16:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

36 - Build Build related PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants