Skip to content

Commit

Permalink
start v24.09.00 development
Browse files Browse the repository at this point in the history
  • Loading branch information
jameslamb committed Oct 23, 2024
1 parent 984baa7 commit b1e63c2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 21 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.06.01
24.09.00
13 changes: 6 additions & 7 deletions conda/recipes/legate-boost/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{% if gpu_enabled == "true" %}
{% set gpu_enabled_bool = true %}
{% elif gpu_enabled == "false" %}
Expand Down Expand Up @@ -80,12 +79,12 @@ requirements:
{% if gpu_enabled_bool %}
- cuda-version ={{ cuda_version }}
- cuda-cudart-dev
- cunumeric {{ legate_version }} =*_gpu
- legate {{ legate_version }} =*_gpu
- cunumeric {{ legate_version }} =*_gpu*
- legate {{ legate_version }} =*_gpu*
- libcublas-dev
{% else %}
- cunumeric {{ legate_version }} =*_cpu
- legate {{ legate_version }} =*_cpu
- cunumeric {{ legate_version }} =*_cpu*
- legate {{ legate_version }} =*_cpu*
{% endif %}
- openblas
- python
Expand All @@ -100,9 +99,9 @@ requirements:
# cuda-version is used to constrain __cuda
- {{ pin_compatible('cuda-version', max_pin='x', min_pin='x') }}
- __cuda
- cunumeric {{ legate_version }} =*_gpu
- cunumeric {{ legate_version }} =*_gpu*
{% else %}
- cunumeric {{ legate_version }} =*_cpu
- cunumeric {{ legate_version }} =*_cpu*
{% endif %}
# Relying on run_exports from legate to pin an appropriate range of versions and
# GPU vs. CPU selector.
Expand Down
23 changes: 10 additions & 13 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,9 @@ NOTE: some steps in this section require direct write access to the repo (includ

### Create a stable release

1. Create a pull request updating the `VERSION` file on the `main` branch to the desired version, with no leading `v`
NOTE: this assumes that the `VERSION` file on the `main` branch already holds the 3-part version number like `24.09.00`.

```shell
echo "24.09.00" > ./VERSION
```

2. Merge that pull request
3. Push a git tag like `v24.09.00` ... that tag push will trigger a new release
1. Push a git tag like `v24.09.00` ... that tag push will trigger a new release

```shell
git checkout main
Expand All @@ -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.
2. Update the `VERSION` file again, to the base version for the anticipated next release (without a leading `v`). Open a pull request with that change. Ensure the pull request title ends with `[skip ci]`.

```shell
git checkout main
git pull upstream main
git checkout -b update-version
echo "24.12.00" > ./VERSION
git commit -m "start v24.12 development [skip ci]"
git push upstream main
git commit -m "start v24.12 development"
git push origin update-version
```

5. Tag that commit with a dev version
3. Merge the pull request.
4. Tag that commit with a dev version

```shell
git checkout main
git pull upstream main
git tag -a v24.12.00dev -m "v24.12.00dev"
git push upstream v24.12.00dev
```
Expand Down

0 comments on commit b1e63c2

Please sign in to comment.