Add notes about workflow during pre-release stages
PiperOrigin-RevId: 520671721
Change-Id: I07ea6ec6736237f512e003b7caca8562c9494948
diff --git a/docs/versioning.md b/docs/versioning.md
index 12434a5..ad75a92 100644
--- a/docs/versioning.md
+++ b/docs/versioning.md
@@ -118,8 +118,10 @@
### Minor (`1.x.0`) {#minor}
Minor indicates compatible public API changes. This number is incremented when
-APIs are added, including the addition of `@Deprecated` annotations. Binary
-compatibility must be preserved between minor version changes.
+APIs are added -- including the addition of `@Deprecated` annotations -- and
+libraries must go through a full [pre-release](#pre-release-suffix) cycle before
+reaching stable. Binary compatibility must be preserved between minor version
+changes.
#### Moving between minor versions:
@@ -132,7 +134,8 @@
Bugfix indicates internal changes to address broken behavior. Care should be
taken to ensure that existing clients are not broken, including clients that may
-have been working around long-standing broken behavior.
+have been working around long-standing broken behavior. Bugfix releases *do not*
+go through a pre-release cycle and are considered stable.
#### Moving between bugfix versions:
@@ -233,6 +236,8 @@
#### Within the `alphaXX` cycle
+* Workflow
+ * Development happens in `androidx-main` or `androidx-platform-dev`
* API surface
* Prior to `alpha01` release, API tracking **must** be enabled (either
`publish=true` or create an `api` directory) and remain enabled
@@ -290,6 +295,9 @@
#### Within the `betaXX` cycle
+* Workflow
+ * Development happens in `androidx-main` or, in extremely limited cases,
+ changes are cherry-picked to a `-release` branch
* API surface
* May not add, remove, or change APIs unless granted an exception by API
Council following the beta API change exception request process
@@ -318,6 +326,7 @@
#### Within the `rcXX` cycle
+* Changes are cherry-picked to a `-release` branch
* Ship-blocking bug fixes only
* All changes must have corresponding tests
* No API changes allowed