Skip to content

Instantly share code, notes, and snippets.

@rail
Created October 19, 2022 20:36
Show Gist options
  • Save rail/f64d84a58c006eed6c660e867cc66aaa to your computer and use it in GitHub Desktop.
Save rail/f64d84a58c006eed6c660e867cc66aaa to your computer and use it in GitHub Desktop.
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
+ linux_platform=linux-3.7.10-gnu
+ fi
# TODO: update publish-provisional-artifacts with option to leave one or more cockroach binaries in the local filesystem
# NB: tar usually stops reading as soon as it sees an empty block but that makes
# curl unhappy, so passing `--ignore-zeros` will cause it to read to the end.
@@ -84,7 +88,7 @@ for platform_name in "${platform_names[@]}"; do
--silent \
--show-error \
--output /dev/stdout \
- --url "https://${bucket}.s3.amazonaws.com/cockroach-${build_name}.linux-${tarball_arch}.tgz" \
+ --url "https://${bucket}.s3.amazonaws.com/cockroach-${build_name}.${linux_platform}-${tarball_arch}.tgz" \
| tar \
--directory="build/deploy-${docker_arch}" \
--extract \
diff --git a/build/teamcity/internal/release/process/publish-cockroach-release.sh b/build/teamcity/internal/release/process/publish-cockroach-release.sh
index ce59de97fa..1b57e0ac4d 100755
--- a/build/teamcity/internal/release/process/publish-cockroach-release.sh
+++ b/build/teamcity/internal/release/process/publish-cockroach-release.sh
@@ -108,6 +108,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
+ linux_platform=linux-3.7.10-gnu
+ fi
# TODO: update publish-provisional-artifacts with option to leave one or more cockroach binaries in the local filesystem
# NB: tar usually stops reading as soon as it sees an empty block but that makes
# curl unhappy, so passing `--ignore-zeros` will cause it to read to the end.
@@ -117,7 +121,7 @@ for platform_name in "${platform_names[@]}"; do
--silent \
--show-error \
--output /dev/stdout \
- --url "https://${bucket}.s3.amazonaws.com/cockroach-${build_name}.linux-${tarball_arch}.tgz" \
+ --url "https://${bucket}.s3.amazonaws.com/cockroach-${build_name}.${linux_platform}-${tarball_arch}.tgz" \
| tar \
--directory="build/deploy-${docker_arch}" \
--extract \
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment