Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update build process to reference release-2.7.2 branch #4983

Merged
merged 1 commit into from
Mar 6, 2023
Merged

update build process to reference release-2.7.2 branch #4983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ steps:
path: /var/run/docker.sock
when:
branch:
- master
- release-2.7.2
event:
exclude:
- pull_request
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
10 changes: 5 additions & 5 deletions scripts/build-static
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}..."
Expand Down