From 189f0a1963acd8def3baf8c17731073b73a72918 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Sat, 19 Jun 2021 07:50:32 -0400 Subject: [PATCH] Tweak dev backporting docs --- dev/release/README.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dev/release/README.md b/dev/release/README.md index 5b31083d040f..f2848652382b 100644 --- a/dev/release/README.md +++ b/dev/release/README.md @@ -233,7 +233,9 @@ following commands As of now, the plan for backporting to `active_release` is to do so semi-manually. -Step 1: Pick the commit to cherry-pick +_Note_: Since minor releases will be automatically picked up by other CI systems, it is CRITICAL to only cherry pick commits that are API compatible -- that is that do not require any code changes in crates that rely on arrow. API changes are released with the next major version. + +Step 1: Pick the commit to cherry-pick. Step 2: Create cherry-pick PR to active_release @@ -249,9 +251,9 @@ git clone git@github.com:apache/arrow-rs.git /tmp/arrow-rs ARROW_GITHUB_API_TOKEN=$ARROW_GITHUB_API_TOKEN CHECKOUT_ROOT=/tmp/arrow-rs CHERRY_PICK_SHA=b2de5446cc1e45a0559fb39039d0545df1ac0d26 python3 dev/release/cherry-pick-pr.py ``` -## Tags +## Labels -There are two tags that help keep track of backporting: +There are two labels that help keep track of backporting: 1. [`cherry-picked`](https://github.com/apache/arrow-rs/labels/cherry-picked) for PRs that have been cherry-picked/backported to `active_release` 2. [`release-cherry-pick`](https://github.com/apache/arrow-rs/labels/release-cherry-pick) for the PRs that are the cherry pick