summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Miller <marco.mmiller@gmail.com>2020-10-29 15:37:27 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-10-29 15:37:27 +0000
commit421a01827b552bc1d0f87d7c0c6eff53e78a2d2c (patch)
tree7cfe1a2c887a52cdc7cbb91e6c88cf7cbcf11ec9
parent911fc801c90250d973df3042ba446d8c50ccd6f1 (diff)
parent114b0f9944bb79cd49803b72ac3ef3a28333fa7b (diff)
Merge "Merge branch 'stable-3.0' into stable-3.1" into stable-3.1
-rw-r--r--.bazelversion2
-rw-r--r--Documentation/dev-release.txt11
-rw-r--r--polygerrit-ui/app/BUILD1
3 files changed, 10 insertions, 4 deletions
diff --git a/.bazelversion b/.bazelversion
index d5c0c99142..7c69a55dbb 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.5.1
+3.7.0
diff --git a/Documentation/dev-release.txt b/Documentation/dev-release.txt
index afd8f86d75..2131d00a69 100644
--- a/Documentation/dev-release.txt
+++ b/Documentation/dev-release.txt
@@ -26,14 +26,19 @@ need to undergo some stabilization before releasing the final release.
* Propose the release with any plans/objectives to the mailing list.
+* Release plans usually become a
+ link:https://www.gerritcodereview.com/news.html[news article]
+ to be followed up with.
+
* Create a Gerrit `rc0`.
-* If needed create a Gerrit `rc1`.
+* If needed create Gerrit `rc1`, `rc2` and `rc3` (one per week, on Mondays
+ or so; see link:https://www.gerritcodereview.com/news.html[past release plans]).
[NOTE]
-You may let in a few features to this release.
+You may let in a few features to these releases.
-* If needed create a Gerrit `rc2`.
+* If needed create a Gerrit `rc4`.
[NOTE]
There should be no new features in this release, only bug fixes.
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 239ad0bdf0..5ec0274d31 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -133,6 +133,7 @@ DIRECTORIES = [
tags = [
# Should not run sandboxed.
"local",
+ "manual",
"template",
],
) for directory in DIRECTORIES]