Skip to content

Instantly share code, notes, and snippets.

View rail's full-sized avatar

Rail Aliiev rail

View GitHub Profile
diff --git a/build/teamcity/internal/release/process/make-and-publish-build-artifacts.sh b/build/teamcity/internal/release/process/make-and-publish-build-artifacts.sh
index 1258a8fcb4..a9414b2679 100755
--- a/build/teamcity/internal/release/process/make-and-publish-build-artifacts.sh
+++ b/build/teamcity/internal/release/process/make-and-publish-build-artifacts.sh
@@ -75,6 +75,10 @@ declare -a combined_image_args
for platform_name in "${platform_names[@]}"; do
tarball_arch="$(tarball_arch_from_platform_name "$platform_name")"
docker_arch="$(docker_arch_from_platform_name "$platform_name")"
+ linux_platform=linux
+ if [[ $tarball_arch == "arm64" ]]; then
@rail
rail / ci.sh
Last active March 30, 2022 13:43
ci () {
local branch=$(git rev-parse --abbrev-ref HEAD)
local user=$(whoami)
git push -f git@github.com:cockroachdb/cockroach.git HEAD:refs/ci/$user/$branch
echo "Visit the following URL in a minute or two: https://teamcity.cockroachdb.com/buildConfiguration/Cockroach_UnitTests?branch=${user}%2F${branch}"
}
diff --git a/cockroachdb/Chart.yaml b/cockroachdb/Chart.yaml
index 7233fd7..5722df1 100644
--- a/cockroachdb/Chart.yaml
+++ b/cockroachdb/Chart.yaml
@@ -1,8 +1,9 @@
+# Generated file, DO NOT EDIT. Source: build/templates/Chart.yaml
apiVersion: v1
name: cockroachdb
home: https://www.cockroachlabs.com
-version: 7.0.0
diff --git a/cockroachdb/Chart.yaml b/cockroachdb/Chart.yaml
index 7233fd7..fca3ae9 100644
--- a/cockroachdb/Chart.yaml
+++ b/cockroachdb/Chart.yaml
@@ -1,8 +1,9 @@
+# Generated file, DO NOT EDIT. Source: build/templates/Chart.yaml
apiVersion: v1
name: cockroachdb
home: https://www.cockroachlabs.com
-version: 7.0.0
diff --git a/DEPS.bzl b/DEPS.bzl
index 114db13e15..da3f728815 100644
--- a/DEPS.bzl
+++ b/DEPS.bzl
@@ -1108,11 +1108,9 @@ def go_deps():
name = "com_github_cloudykit_fastprinter",
build_file_proto_mode = "disable_global",
importpath = "github.com/CloudyKit/fastprinter",
- sha256 = "6e4b00c3d8de85c23b7e90e6b6fe4863d3317775493a81197155e0a410d6ed57",
- strip_prefix = "github.com/CloudyKit/fastprinter@v0.0.0-20170127035650-74b38d55f37a",
diff --git a/Makefile b/Makefile
index e7ef845c98..f2748056da 100644
--- a/Makefile
+++ b/Makefile
@@ -788,7 +788,6 @@ SWAGGER_TARGETS := \
DOCGEN_TARGETS := \
bin/.docgen_bnfs \
bin/.docgen_functions \
- docs/generated/redact_safe.md \
bin/.docgen_http \
build/release/teamcity-mark-build-qualified.sh | 3 +-
build/release/teamcity-mark-build.sh | 30 +++++++
pkg/cmd/release/BUILD.bazel | 15 ++++
pkg/cmd/release/main.go | 109 +++++++++++++++++++++++++
4 files changed, 156 insertions(+), 1 deletion(-)
diff --git a/build/release/teamcity-mark-build-qualified.sh b/build/release/teamcity-mark-build-qualified.sh
index ca9f00cbbf..145b2bb2f4 100755
--- a/build/release/teamcity-mark-build-qualified.sh
+++ b/build/release/teamcity-mark-build-qualified.sh
commit 9ddff96937ff110f9319893d465089c5ec2d3138
Author: Rail Aliiev <rail@iqchoice.com>
Date: Thu Jan 6 10:43:55 2022 -0500
week 0 release automation
Release note (<category, see below>): <what> <show> <why>
release: add pick sha skeleton
diff --git a/Makefile b/Makefile
index de5c56d..bf5e627 100644
--- a/Makefile
+++ b/Makefile
@@ -1,25 +1,25 @@
# https://github.com/egregors/teamcity-docker-compose
# Team City
-COMPOSE_FILE=docker-compose.yml
+COMPOSE_FILE=docker-compose-nossl.yml
diff --git a/build/release/teamcity-mark-build.sh b/build/release/teamcity-mark-build.sh
index 25acb1da85..9e955c7322 100755
--- a/build/release/teamcity-mark-build.sh
+++ b/build/release/teamcity-mark-build.sh
@@ -17,17 +17,24 @@ mark_build() {
gcr_repository="us-docker.pkg.dev/cockroach-cloud-images/cockroachdb/cockroach"
else
google_credentials=$GOOGLE_COCKROACH_RELEASE_CREDENTIALS
gcr_repository="us.gcr.io/cockroach-release/cockroach-test"
fi