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

Jump to bottom

Handle multiple lightweight tabs on a commit #1858

Merged
merged 1 commit into from
Jun 28, 2018
Merged

Handle multiple lightweight tabs on a commit #1858

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
2 changes: 1 addition & 1 deletion installer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ GOLINT ?= $(GOPATH)/bin/golint$(BIN_ARCH)

.PHONY: gas ova

LDFLAGS := $(shell BUILD_NUMBER=${BUILD_NUMBER} $(BASE_DIR)/scripts/version-linker-flags.sh)
LDFLAGS := $(shell BUILD_NUMBER=${BUILD_NUMBER} TAG=${TAG} $(BASE_DIR)/scripts/version-linker-flags.sh)

ovfenv := $(BIN)/ovfenv
vic-ova-ui := $(BIN)/vic-ova-ui
Expand Down
6 changes: 4 additions & 2 deletions installer/build/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ADMIRAL=""
VICENGINE=""
VIC_MACHINE_SERVER=""
HARBOR=""
TAG=$(git describe --abbrev=0 --tags) # e.g. `v0.9.0`
TAG=${DRONE_TAG:-$(git describe --abbrev=0 --tags)} # e.g. `v0.9.0`
REV=$(git rev-parse --short=8 HEAD)
DRONE_BUILD_NUMBER=${DRONE_BUILD_NUMBER:-0}
BUILD_OVA_REVISION="${TAG}-${DRONE_BUILD_NUMBER}-${REV}"
Expand Down Expand Up @@ -57,6 +57,7 @@ if [ "$step" == "ova-dev" ]; then
-v /var/run/docker.sock:/var/run/docker.sock \
-e DEBUG=${DEBUG} \
-e BUILD_OVA_REVISION=${BUILD_OVA_REVISION} \
-e TAG=${TAG} \
-e BUILD_NUMBER=${BUILD_NUMBER} \
-e DRONE_BUILD_NUMBER=${DRONE_BUILD_NUMBER} \
-e TERM -w ${ROOT_INSTALLER_WORK_DIR} \
Expand All @@ -65,9 +66,10 @@ elif [ "$step" == "ova-ci" ]; then
echo "starting ci build..."
export DEBUG=${DEBUG}
export BUILD_OVA_REVISION=${BUILD_OVA_REVISION}
export TAG=${TAG}
export BUILD_NUMBER=${BUILD_NUMBER}
export DRONE_BUILD_NUMBER=${DRONE_BUILD_NUMBER}
./build/build-ova.sh $*
else
usage
fi
fi
2 changes: 1 addition & 1 deletion installer/scripts/version-linker-flags.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#

echo "-s -w \
-X github.com/vmware/vic-product/installer/pkg/version.Version=`git describe --abbrev=0 --tags` \
-X github.com/vmware/vic-product/installer/pkg/version.Version=`${TAG}` \
-X github.com/vmware/vic-product/installer/pkg/version.BuildNumber=\"${BUILD_NUMBER}\" \
-X github.com/vmware/vic-product/installer/pkg/version.BuildDate=`date -u +%Y/%m/%d@%H:%M:%S` \
-X github.com/vmware/vic-product/installer/pkg/version.GitCommit=`git rev-parse --short HEAD` \
Expand Down