luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Pass the git commits year through as an env var to the ui build (#7126)

This commit is contained in:
Matt Keeler 2020-01-24 10:40:14 -05:00 committed by GitHub
parent 1c4937d507
commit cdacfcaa6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/bash_env.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
export GIT_COMMIT=$(git rev-parse --short HEAD) export GIT_COMMIT=$(git rev-parse --short HEAD)
export GIT_COMMIT_YEAR=$(git show -s --format=%cd --date=format:%Y HEAD)
export GIT_DIRTY=$(test -n "`git status --porcelain`" && echo "+CHANGES" || true) export GIT_DIRTY=$(test -n "`git status --porcelain`" && echo "+CHANGES" || true)
export GIT_DESCRIBE=$(git describe --tags --always --match "v*") export GIT_DESCRIBE=$(git describe --tags --always --match "v*")
export GIT_IMPORT=github.com/hashicorp/consul/version export GIT_IMPORT=github.com/hashicorp/consul/version

3
GNUmakefile
View File

@ -25,6 +25,7 @@ MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
ASSETFS_PATH?=agent/bindata_assetfs.go ASSETFS_PATH?=agent/bindata_assetfs.go
# Get the git commit # Get the git commit
GIT_COMMIT?=$(shell git rev-parse --short HEAD) GIT_COMMIT?=$(shell git rev-parse --short HEAD)
GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
GIT_DIRTY?=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true) GIT_DIRTY?=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
GIT_DESCRIBE?=$(shell git describe --tags --always --match "v*") GIT_DESCRIBE?=$(shell git describe --tags --always --match "v*")
GIT_IMPORT=github.com/hashicorp/consul/version GIT_IMPORT=github.com/hashicorp/consul/version
@ -127,6 +128,7 @@ export GO_BUILD_TAG
export UI_BUILD_TAG export UI_BUILD_TAG
export BUILD_CONTAINER_NAME export BUILD_CONTAINER_NAME
export GIT_COMMIT export GIT_COMMIT
export GIT_COMMIT_YEAR
export GIT_DIRTY export GIT_DIRTY
export GIT_DESCRIBE export GIT_DESCRIBE
export GOTAGS export GOTAGS
@ -284,6 +286,7 @@ test-docker: linux go-build-image
-e 'GOTEST_PKGS=$(GOTEST_PKGS)' \ -e 'GOTEST_PKGS=$(GOTEST_PKGS)' \
-e 'GOTAGS=$(GOTAGS)' \ -e 'GOTAGS=$(GOTAGS)' \
-e 'GIT_COMMIT=$(GIT_COMMIT)' \ -e 'GIT_COMMIT=$(GIT_COMMIT)' \
-e 'GIT_COMMIT_YEAR=$(GIT_COMMIT_YEAR)' \
-e 'GIT_DIRTY=$(GIT_DIRTY)' \ -e 'GIT_DIRTY=$(GIT_DIRTY)' \
-e 'GIT_DESCRIBE=$(GIT_DESCRIBE)' \ -e 'GIT_DESCRIBE=$(GIT_DESCRIBE)' \
$(TEST_PARALLELIZATION) \ $(TEST_PARALLELIZATION) \

10
build-support/functions/20-build.sh
View File

@ -34,6 +34,7 @@ function build_ui {
# #
# Notes: # Notes:
# Use the GIT_COMMIT environment variable to pass off to the build # Use the GIT_COMMIT environment variable to pass off to the build
# Use the GIT_COMMIT_YEAR environment variable to pass off to the build
if ! test -d "$1" if ! test -d "$1"
then then
@ -63,6 +64,13 @@ function build_ui {
then then
commit_hash=$(git rev-parse --short HEAD) commit_hash=$(git rev-parse --short HEAD)
fi fi
local commit_year="${GIT_COMMIT_YEAR}"
if test -z "${commit_year}"
then
commit_year=$(git show -s --format=%cd --date=format:%Y HEAD)
fi
local logo_type="${CONSUL_BINARY_TYPE}" local logo_type="${CONSUL_BINARY_TYPE}"
if test "$logo_type" != "oss" if test "$logo_type" != "oss"
then then
@ -73,7 +81,7 @@ function build_ui {
pushd ${ui_dir} > /dev/null pushd ${ui_dir} > /dev/null
status "Creating the UI Build Container with image: ${image_name} and version '${version}'" status "Creating the UI Build Container with image: ${image_name} and version '${version}'"
local container_id=$(docker create -it -e "CONSUL_GIT_SHA=${commit_hash}" -e "CONSUL_VERSION=${version}" -e "CONSUL_BINARY_TYPE=${CONSUL_BINARY_TYPE}" ${image_name}) local container_id=$(docker create -it -e "CONSUL_GIT_SHA=${commit_hash}" -e "CONSUL_COPYRIGHT_YEAR=${commit_year}" -e "CONSUL_VERSION=${version}" -e "CONSUL_BINARY_TYPE=${CONSUL_BINARY_TYPE}" ${image_name})
local ret=$? local ret=$?
if test $ret -eq 0 if test $ret -eq 0
then then