Skip to content

The conda-package workflow triggers change#639

Merged
oleksandr-pavlyk merged 2 commits intomasterfrom
workflow-triggers-push-pull_request
Nov 1, 2021
Merged

The conda-package workflow triggers change#639
oleksandr-pavlyk merged 2 commits intomasterfrom
workflow-triggers-push-pull_request

Conversation

@oleksandr-pavlyk
Copy link
Copy Markdown
Contributor

The workflow should trigger on pushes to any branch, and on pull_requests

The workflow should trigger on pushes to any branch, and
on pull_requests
@coveralls
Copy link
Copy Markdown
Collaborator

coveralls commented Oct 26, 2021

Coverage Status

Coverage remained the same at 74.511% when pulling fccb94a on workflow-triggers-push-pull_request into d0f13bb on master.

@PokhodenkoSA
Copy link
Copy Markdown
Contributor

I disabled pull_requests due to security. As I did not know how it works for foreign PRs.

@oleksandr-pavlyk
Copy link
Copy Markdown
Contributor Author

I disabled pull_requests due to security. As I did not know how it works for foreign PRs.

Without pull_requests trigger, PRs opened from forked repos do not get scheduled, like happened in #636

@oleksandr-pavlyk
Copy link
Copy Markdown
Contributor Author

I do not understand why some upload tasks failed. They should have been ignored.

@PokhodenkoSA
Copy link
Copy Markdown
Contributor

I do not understand why some upload tasks failed. They should have been ignored.

It is because there is package with the same version on the channel. It was happened when we added release* branch for uploading.
Version is from latest tag + number of commits from tag (as build number). Now branch release0.11 is used for preparing release. It contains tag 0.11.0rc1. At the same time master branch have tag 0.11.0rc1 and do not have tag like 0.12.0dev0 for building packages for the next release as master branch is for new development and release0.11 branch for stabilization. But there is also branch gold/2021 which is the same as release0.11 now and used for building in internal CI.
Possibly release branches are overhead but they are useful for stabilization before release and master should be considered like something not for the current release - for merging changes during code freeze.

@oleksandr-pavlyk
Copy link
Copy Markdown
Contributor Author

Can we use --skip option of anaconda to not error out in such situation?

@PokhodenkoSA
Copy link
Copy Markdown
Contributor

Can we use --skip option of anaconda to not error out in such situation?

We can. But it will only hide an error.
Process should be changed. Two branches master and release should not create packages with the same version.
Version is defined according to the last tag. So master and release should have different last tags. I.e. master 0.12.0dev0 and release 0.11.0rc1. But sometimes master urgently receives updates which also needed in release. So we usually do merge master to release. It makes 0.12.0dev0 merge to release. Cherry-picking instead? Do not know.
Maybe release from master? How to stabilize master during release? Stop breaking features for some time? Possibly.
So How to do that? - this is the question.

@oleksandr-pavlyk oleksandr-pavlyk enabled auto-merge (squash) November 1, 2021 20:26
@oleksandr-pavlyk oleksandr-pavlyk merged commit b8249c7 into master Nov 1, 2021
@oleksandr-pavlyk oleksandr-pavlyk deleted the workflow-triggers-push-pull_request branch November 1, 2021 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants