iceberg icon indicating copy to clipboard operation
iceberg copied to clipboard

Fix CI script inclusion of release branches (v2)

Open findepi opened this issue 1 year ago • 8 comments

The CI scripts are meant to run on release maintenance branches such as 1.5.x. They were run for releases up to 1.0 because of the 0.* pattern. This commit fixes this by replacing branch allow-list with a deny-list for triggering the builds.

Alternative to https://github.com/apache/iceberg/pull/10514

findepi avatar Jun 17 '24 11:06 findepi

Once this is merged, the changes need to be backported to existing active 1.x.x branches.

findepi avatar Jun 17 '24 11:06 findepi

do we want to run CI on maintenance branches such as 1.5.x?

findepi avatar Jun 27 '24 19:06 findepi

do we want to run CI on maintenance branches such as 1.5.x?

Yes, that makes sense. I think I have a preference for https://github.com/apache/iceberg/pull/10514 because it is easier to reason about, and more future-proof (in case we add a new branch).

Fokko avatar Jun 28 '24 06:06 Fokko

My personal preference is with this one. in #10514 I didn't like the fact that i foresaw 2.x release branches and i didn't foresee 3.x release branches (or 4.x, ...). And i wanted to foresee 2.x release branches because they are imminent. But more important to fix the problem and both PRs do this and any solution still need to be backported to release branches.

I undrafted #10514, please decide.

findepi avatar Jun 28 '24 06:06 findepi

@findepi I'm fine either way. I looked at the branches, and it is very clean at the moment (just the ones that you marked here). @nastra do you have a preference?

Fokko avatar Jun 28 '24 07:06 Fokko

I'm personally also in favor of #10514 as it's easy to understand and should have enough future-proofness

nastra avatar Jun 28 '24 09:06 nastra

thank you @nastra for your feedback

i actually think we can do even simpler: remove any branch patterns. it won't make the ci run on docs or gh-pages branches -- we don't have the workflow files there at all, so they won't run anyway.

the only case where branch patterns matter is when someone creates a new branch off master. this obviously happens when creating new maintenance branch for a release. from this perspective, we don't need any patters. This obviously happens also when dependabot creates a branch (and we should exclude it as in this PR). Are there any other situations like this? If no, we can have just this branches-ignore: 'dependabot/**'

findepi avatar Jun 28 '24 09:06 findepi

changed the PR with the above in mind. it's now simpler. but will also undraft https://github.com/apache/iceberg/pull/10514.

also sent https://github.com/apache/iceberg/pull/10578 to fix current 1.5.x branch

findepi avatar Jun 28 '24 10:06 findepi

https://github.com/apache/iceberg/pull/10514 merged, so closing this one

findepi avatar Jul 16 '24 21:07 findepi