From c63094adfae45fb6bdb2dd22e8f5f992feaca4bd Mon Sep 17 00:00:00 2001 From: nazunalika Date: Tue, 26 Oct 2021 23:16:30 -0700 Subject: [PATCH 1/3] prep for 8.5 --- sync/common_8 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync/common_8 b/sync/common_8 index 29b079a..138d6fc 100644 --- a/sync/common_8 +++ b/sync/common_8 @@ -1,13 +1,13 @@ # To be sourced by scripts to use # Revision must always start with a major number -REVISION=8.4 +REVISION=8.5 MAJOR="${REVISION:0:1}" MINOR="${REVISION:2:1}" # comment or blank if needed -APPEND_TO_DIR="-RC2" +APPEND_TO_DIR="-RC1" STAGING_ROOT="/mnt/repos-staging" PRODUCTION_ROOT="/mnt/repos-production" From 4d4f89f8b6ac20bf2a342df4f5f31a91e9f48df3 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 1 Nov 2021 13:12:48 -0700 Subject: [PATCH 2/3] further prep for 8.5 --- sync/minor-release-sync-to-staging.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index ea769b5..dd83dba 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -68,3 +68,7 @@ ret_val=$? if [ "$ret_val" -eq 0 ]; then $(dirname "$0")/sign-repos-only.sh fi + +# Change Symlink if required +/bin/rm ${STAGING_ROOT}/${CATEGORY_STUB}/latest-8 +ln -sr ${STAGING_ROOT}/${CATEGORY_STUB}/${REV} latest-8 From 6dc94f2492c1d335d4d1f144558006c84d405adc Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 1 Nov 2021 13:27:41 -0700 Subject: [PATCH 3/3] make shellcheck happy on job 91 --- sync/minor-release-sync-to-staging.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index dd83dba..66c5f39 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -70,5 +70,5 @@ if [ "$ret_val" -eq 0 ]; then fi # Change Symlink if required -/bin/rm ${STAGING_ROOT}/${CATEGORY_STUB}/latest-8 -ln -sr ${STAGING_ROOT}/${CATEGORY_STUB}/${REV} latest-8 +/bin/rm "${STAGING_ROOT}/${CATEGORY_STUB}/latest-8" +ln -sr "${STAGING_ROOT}/${CATEGORY_STUB}/${REV}" latest-8