Skip to content

Commit 328f39b

Browse files
authored
fix(release): prepare the 55 release process (#2527)
1 parent 54a42db commit 328f39b

4 files changed

Lines changed: 27 additions & 8 deletions

File tree

‎.asf.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ github:
5555
branch-54:
5656
required_pull_request_reviews:
5757
required_approving_review_count: 1
58+
branch-55:
59+
required_pull_request_reviews:
60+
required_approving_review_count: 1
5861
# publishes the content of the `asf-site` branch to
5962
# https://datafusion.apache.org/ballista/
6063
rulesets:

‎dev/release/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ Before creating a new release:
8787
- a PR should be created and merged to update the major version number of the project. There is a script to automate
8888
updating the version number: `./dev/update_ballista_versions.py 0.11.0`. The script does not change `python/`,
8989
which is versioned as part of the [Python client release](../../python/dev/release/README.md)
90+
- Add the new release branch to `github.protected_branches` in `.asf.yaml` so that it requires an approving review
9091
- A new release branch should be created, such as `branch-0.11`
9192

9293
Once the release branch has been created, the `main` branch can immediately go back to depending on DataFusion with a
@@ -155,9 +156,9 @@ tag the commit it was created for convenience and code archaeology.
155156
Using a string such as `0.11.0` as the `<version>`, create and push the tag by running these commands:
156157

157158
```shell
158-
git tag <version>-<rc>
159+
git tag <version>-rc<rc>
159160
# push tag to Github remote
160-
git push apache <version>
161+
git push apache <version>-rc<rc>
161162
```
162163

163164
### Create, sign, and upload artifacts

‎dev/release/create-tarball.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Here is my vote: +1
103103
104104
[1]: https://github.com/apache/datafusion-ballista/tree/${release_hash}
105105
[2]: ${url}
106-
[3]: https://github.com/apache/datafusion-ballista/blob/${release_hash}/CHANGELOG.md
106+
[3]: https://github.com/apache/datafusion-ballista/blob/${release_hash}/docs/source/changelog/${version}.md
107107
MAIL
108108
echo "---------------------------------------------------------"
109109

‎dev/release/verify-release-candidate.sh‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,26 @@ test_source_distribution() {
141141
exit 1
142142
fi
143143

144-
# Note can't verify other ballista crates as they depend
145-
# on ballista-core which isn't published yet
146-
pushd ballista/core
147-
cargo publish --dry-run
148-
popd
144+
# Check that Cargo can determine the package contents for every crate that
145+
# will be published. Full dry runs of dependent crates are not possible until
146+
# their Ballista dependencies have been published to crates.io.
147+
publishable_crates=(
148+
ballista-core
149+
ballista-api-types
150+
ballista-executor
151+
ballista-history
152+
ballista-scheduler
153+
ballista
154+
ballista-cli
155+
)
156+
for crate in "${publishable_crates[@]}"; do
157+
cargo package --list --package "${crate}" --locked >/dev/null
158+
done
159+
160+
# These two crates have no unpublished Ballista dependencies, so Cargo can
161+
# build and validate their complete publish artifacts before the vote.
162+
cargo publish --dry-run --package ballista-core --locked
163+
cargo publish --dry-run --package ballista-api-types --locked
149164
}
150165

151166
TEST_SUCCESS=no

0 commit comments

Comments
 (0)