Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

start v24.09.00 development [skip ci] #171

Merged
merged 3 commits into from
Oct 28, 2024

Conversation

jameslamb
Copy link
Member

#163 added support for legate / cunumeric 24.09 nightlies here.

This PR proposes the following:

  • starting to version legate-boost packages as 24.09.00dev{n}
  • updating the instructions for releasing
  • minor adjustments to how we pin to legate / cunumeric packages

Notes for Reviewers

See inline comments for explanations of these changes.

@jameslamb jameslamb added improvement Improves an existing functionality non-breaking Introduces a non-breaking change labels Oct 23, 2024
@@ -213,19 +208,21 @@ git tag -a v24.09.00 -m 'v24.09.00'
git push upstream 'v24.09.00'
```

4. Update the `VERSION` file again, to the base version for the anticipated next release. Push this directly to `main`, with a commit that includes `[skip ci]` in the message so new packages will not be built from it.
Copy link
Member Author

@jameslamb jameslamb Oct 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After merging #169, I tried to follow these instructions. They don't work because the current branch permissions in this repo don't allow me to push directly to main.

remote: Resolving deltas: 100% (1/1), completed with 1 local object.
remote: error: GH013: Repository rule violations found for refs/heads/main.
remote: Review all repository rules at https://github.com/rapidsai/legate-boost/rules?ref=refs%2Fheads%2Fmain
remote: 
remote: - Changes must be made through a pull request.
remote: 
remote: - Required status check "pr-builder / run" is expected.
remote: 
To github.com:rapidsai/legate-boost.git
 ! [remote rejected] main -> main (push declined due to repository rule 

Honestly... that's a good thing. This PR proposes a different way to update the development version without accidentally publishing e.g. the first 24.09.00 package with a version like 24.06.01dev{n}.

It proposes:

  1. opening a PR like this one
  2. adding [skip ci] to the end of the title, so merging it to main won't trigger a new branch build on main
  3. manually pushing a tag like v24.09.00dev to main after merging

I'm going to be out until Monday... so @seberg @RAMitchell if you merge this while I'm out, can you please then immediately push a tag like that to main?

@jameslamb jameslamb changed the title WIP: start v24.09.00 development WIP: start v24.09.00 development [skip ci] Oct 23, 2024
Comment on lines +82 to +83
- cunumeric {{ legate_version }} =*_gpu*
- legate {{ legate_version }} =*_gpu*
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*_gpu = "ends with _gpu"

*_gpu* = "contains _gpu somewhere"

I think we want that slightly more flexible form, as there's no guarantee that the packages we install will always end with _gpu (even if the packages we currently build do).

Look at the diff from the PR that added these build string components to legate packages... there are some other things at the end of the build strings sometimes: https://github.com/nv-legate/legate.core.internal/pull/1164/files

@@ -14,7 +14,6 @@
# '*_gpu' for systems with CUDA
#
# this mirrors the approach used by cunumeric / legate
# (though as of 24.06, they do not append a '*_gpu' to the build string for GPU packages)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jameslamb jameslamb changed the title WIP: start v24.09.00 development [skip ci] start v24.09.00 development [skip ci] Oct 28, 2024
@jameslamb jameslamb marked this pull request as ready for review October 28, 2024 15:34
Copy link
Contributor

@seberg seberg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@jameslamb jameslamb merged commit 166c98d into rapidsai:main Oct 28, 2024
10 checks passed
@jameslamb jameslamb deleted the update-version branch October 28, 2024 18:00
@jameslamb
Copy link
Member Author

Looks like the [skip ci] approach worked! No new build was triggered when this was merged to main: https://github.com/rapidsai/legate-boost/actions/workflows/build.yaml

Then I pushed a new tag to the repo, following these docs.

git checkout main
git pull upstream main
git tag -a v24.09.00dev -m "v24.09.00dev"
git push upstream v24.09.00dev

https://github.com/rapidsai/legate-boost/releases/tag/v24.09.00dev

That also did not trigger a new build, because of this regex that says "only do a new build on tags of releases"

# run on pushes of new release tags
tags:
- v[0-9][0-9].[0-9][0-9].[0-9][0-9]

I'd copied that regex from other RAPIDS repos (e.g. this cudf example). There, it serves the purpose "don't run a new build when a non-release tag is pushed".

But I think here in this repo, since we'll now use a PR with [skip ci] in the commit message, we really do want to trigger the build job on any tag push. Otherwise, it'd take a PR like this one and then a second PR to get the first new packages produced. I'll push a follow-up with changes like that.

@jameslamb
Copy link
Member Author

I just deleted that v24.09.00dev tag, in place of a v24.09.00.dev tag on the same commit.

git checkout main
git pull upstream main
git tag -d v24.09.00dev
git tag -a v24.09.00.dev -m "v24.09.00.dev"
git push upstream v24.09.00.dev

To match the way that cunumeric and legate are versions, where the version ends with a .dev{n}.

I'm updating the packaging stuff for this repo to reflect that, in #173.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improves an existing functionality non-breaking Introduces a non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants