Skip to content

CI: fix CIRRUS_TAG check when tagging. Closes #22730#22752

Merged
charris merged 3 commits intonumpy:mainfrom
andyfaff:tagger2
Dec 7, 2022
Merged

CI: fix CIRRUS_TAG check when tagging. Closes #22730#22752
charris merged 3 commits intonumpy:mainfrom
andyfaff:tagger2

Conversation

@andyfaff
Copy link
Copy Markdown
Member

@andyfaff andyfaff commented Dec 7, 2022

@charris

Closes #22730.

@charris
Copy link
Copy Markdown
Member

charris commented Dec 7, 2022

Ah... looks reasonable :) The other thing that might be worth checking is that it uploads to the staging repo. I think that should be the case for all maintenance branches.

@andyfaff
Copy link
Copy Markdown
Member Author

andyfaff commented Dec 7, 2022

As it stands the code should upload any tag that begins with v, no matter what branch it originally came from.

@charris
Copy link
Copy Markdown
Member

charris commented Dec 7, 2022

no matter what branch it originally came from

Uploads from main should go to nightly, from branches to staging. The only tags we currently push to main are of the form "v1.25.0.dev0", and we could safely ignore those. I'm a bit concerned because the manual build of 1.24.x uploaded to nightly.

@andyfaff
Copy link
Copy Markdown
Member Author

andyfaff commented Dec 7, 2022

At the moment all manual builds are classified as IS_SCHEDULED_DISPATCH,

if [[ "$CIRRUS_BUILD_SOURCE" == "api" && "$CIRRUS_COMMIT_MESSAGE" == "API build for null" ]]; then export IS_SCHEDULE_DISPATCH="true"
, which get uploaded to nightly. Perhaps the CIRRUS_TAG check should be moved down by three lines? At the moment all tags (no matter which branch) are being pushed to staging. Do you want tags from main to go to nightly, and tags from maintenance branches to go to staging?

@charris
Copy link
Copy Markdown
Member

charris commented Dec 7, 2022

Do you want tags from main to go to nightly, and tags from maintenance branches to go to staging?

That would be good. Or you can just ignore tags on main.

@andyfaff
Copy link
Copy Markdown
Member Author

andyfaff commented Dec 7, 2022

Ok, now tags beginning with v and are on a maintenance branch get uploaded to staging (IS_PUSH=true). cron/manual builds will still get uploaded to nightly (IS_SCHEDULE_DISPATCH=true).

@charris charris merged commit 6f9237e into numpy:main Dec 7, 2022
@charris
Copy link
Copy Markdown
Member

charris commented Dec 7, 2022

Thanks Andrew.

@charris charris removed the 09 - Backport-Candidate PRs tagged should be backported label Dec 8, 2022
@charris
Copy link
Copy Markdown
Member

charris commented Dec 18, 2022

@andyfaff This didn't fix the problem, there was still no upload with the v1.24.0 tag push.

@andyfaff andyfaff deleted the tagger2 branch April 11, 2023 07:59
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.

Cirrus fails to upload wheels on tag push.

2 participants