search

conda-forge / iris-feedstock

A conda-smithy repository for iris.
BSD 3-Clause "New" or "Revised" License
0 stars 17 forks source link

V3.7.0rc0 #99

Closed pp-mo closed 1 year ago

pp-mo commented 1 year ago

Updated for release-candidate

IMPORTANT NOTES A lot has changed just recently in the main branch (since v3.6.1), and this "release-candidate" branch is now rather seriously adrift as is has not been kept up-to-date with main : a direct comparison shows a number of differences where this branch is just "wrong", but the fix has never made it across from main.

However, an attempt to force-push this branch caused some chaos since it wound up pushing a v3.7.0rc0 build onto the conda-forge "main" iris channel, which then had to be removed. I think the problem with that was probably that in just pushing to the branch, it had no opportunity to be "re-rendered" correctly. But whenever you merge to a branch it will build, and potentially (untested) may even put a duplicate re-build (with no distinguishing build-number increment) onto the channel, which would be a Bad Thing :tm:.

So, since a merge from main is so messy, yet changing without a PR is dangerious, I have introduced on this PR the commit https://github.com/conda-forge/iris-feedstock/pull/99/commits/92ee785cf0ebb61ee92eab6a3e06cc4fef900508. This supposed "merge" commit actually resets the whole branch content to be == main. Following that, I have re-introduced the changes specific to the RC build, and finally updated to build the desired new v3.7.0rc0. So, this makes a nasty mess of the history here, but you only need to consider changes from the merge commit onwards -- or, I think the diff view makes OK sense, too.

I think a reasonable future usage of this should be, to always merge-back from main, within each PR that updates the release-channel branch.

Checklist

conda-forge-webservices[bot] commented 1 year ago

Hi! This is the friendly automated conda-forge-linting service.

I was trying to look for recipes to lint for you, but it appears we have a merge conflict. Please try to merge or rebase with the base branch to resolve this conflict.

Please ping the 'conda-forge/core' team (using the @ notation in a comment) if you believe this is a bug.

trexfeathers commented 1 year ago

@pp-mo this should be pointing at the release-candidate branch.

You'll also need to bring #96 over because that only ever went into main

pp-mo commented 1 year ago

@pp-mo this should be pointing at the release-candidate branch.

You'll also need to bring #96 over because that only ever went into main

Thanks for help ! Actually there do seem to be a number of discrepancies now between main and release-candidate.

conda-forge-webservices[bot] commented 1 year ago

Hi! This is the friendly automated conda-forge-linting service.

I just wanted to let you know that I linted all conda-recipes in your PR (recipe) and found it was in an excellent condition.

pp-mo commented 1 year ago

@conda-forge-admin, please rerender

pp-mo commented 1 year ago

@trexfeathers can you help with this ?

I have basically completely re-created this, and it seems to me that it should now at least update the correct channel, since the conda_build_config.yaml file is present + hopefully gets that right, according to the docs advice as we discussed yesterday

So, please can you take a look at this, and see if you can convince yourself that it has the right changes now ?

pp-mo commented 1 year ago

Closing because, after much offline discussion with @trexfeathers, we now think it makes sense to start again with a new "rc" branch, based on the current main.

In future we aim to be more careful to keep it up-to-date with changes to the main branch.