From cdf3a3b846c262c4acd6bcc793edf22e31d2d5d2 Mon Sep 17 00:00:00 2001 From: Nancy Butler <42977925+mantis-toboggan-md@users.noreply.github.com> Date: Mon, 6 Mar 2023 10:15:11 -0700 Subject: [PATCH] update build refs to new release-2.7.2 branch --- .drone.yml | 8 ++++---- package.json | 2 +- scripts/build-static | 10 +++++----- scripts/ci | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index fcee86f5e4..fb40658375 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,7 +33,7 @@ steps: path: /var/run/docker.sock when: branch: - - master + - release-2.7.2 event: exclude: - pull_request @@ -46,13 +46,13 @@ steps: acl: - allUsers:READER cache_control: "no-cache,must-revalidate" - source: dist/static/latest2 - target: releases.rancher.com/ui/latest2 + source: dist/static/release-2.7.2 + target: releases.rancher.com/ui/release-2.7.2 token: from_secret: google_auth_key when: branch: - - master + - release-2.7.2 event: exclude: - pull_request diff --git a/package.json b/package.json index bd6cfeaf4c..48e3399037 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ui", - "version": "master-dev", + "version": "2.7.2-dev", "private": true, "repository": "https://github.com/rancher/ui", "license": "Apache-2.0", diff --git a/scripts/build-static b/scripts/build-static index 7268a6cc64..49447d0171 100755 --- a/scripts/build-static +++ b/scripts/build-static @@ -30,7 +30,7 @@ function printHelp() { build-static Usage: -d - Build debug instead of production build -f - Force: Turn off checks that prevent you from doing bad things - -l - Build as "latest2" instead of the version in package.json + -l - Build as "release-2.7.2" instead of the version in package.json -t - Tag and push tag -u - Upload to GCE -s - Skip tests @@ -125,7 +125,7 @@ if [[ `git status --porcelain` ]]; then fi # UPLOAD_LATEST=true is set by Drone for auto upload to CDN -if [[ "${BRANCH}" == "master" ]] && [[ "${UPLOAD_LATEST}" == "true" ]]; then +if [[ "${BRANCH}" == "release-2.7.2" ]] && [[ "${UPLOAD_LATEST}" == "true" ]]; then UPLOAD=2 LATEST=1 fi @@ -138,8 +138,8 @@ if [[ $LATEST -eq 1 ]] && [[ $TAG -eq 1 ]]; then fi fi -if ( [[ $TAG -eq 1 ]] || [[ $UPLOAD -ne 0 ]] ) && [[ "${BRANCH}" != "master" ]]; then - echo "You can only tag or upload the master branch (you are on '${BRANCH}')." +if ( [[ $TAG -eq 1 ]] || [[ $UPLOAD -ne 0 ]] ) && [[ "${BRANCH}" != "release-2.7.2" ]]; then + echo "You can only tag or upload the release-2.7.2 branch (you are on '${BRANCH}')." if [[ $FORCE -ne 1 ]]; then exit 1; fi @@ -157,7 +157,7 @@ if [[ "${FORCE_VERSION}" != "" ]]; then VERSION=${FORCE_VERSION} else if [[ $LATEST -eq 1 ]]; then - VERSION="latest2" + VERSION="release-2.7.2" else VERSION=${PKG_VERSION} fi diff --git a/scripts/ci b/scripts/ci index 3b00285fd8..b5c17b5361 100755 --- a/scripts/ci +++ b/scripts/ci @@ -34,7 +34,7 @@ fi if [[ "${BUILD_LATEST}" == "true" ]]; then echo "Building latest..." - ./scripts/build-static -l -v latest2 + ./scripts/build-static -l -v release-2.7.2 # (build-static contains a call to test & build) elif [[ ! -z "${CI_BUILD_TAG}" ]]; then echo "Building v${CI_BUILD_TAG}..."