mirror of https://github.com/hashicorp/consul
Update all the references in CI and makefile to the bindata file location
parent
3ff5901be8
commit
3b8125a24d
|
@ -626,7 +626,7 @@ jobs:
|
||||||
- persist_to_workspace:
|
- persist_to_workspace:
|
||||||
root: .
|
root: .
|
||||||
paths:
|
paths:
|
||||||
- ./agent/bindata_assetfs.go
|
- ./agent/uiserver/bindata_assetfs.go
|
||||||
- run: *notify-slack-failure
|
- run: *notify-slack-failure
|
||||||
|
|
||||||
# commits static assets to git
|
# commits static assets to git
|
||||||
|
@ -641,16 +641,16 @@ jobs:
|
||||||
- attach_workspace:
|
- attach_workspace:
|
||||||
at: .
|
at: .
|
||||||
- run:
|
- run:
|
||||||
name: commit agent/bindata_assetfs.go if there are changes
|
name: commit agent/uiserver/bindata_assetfs.go if there are changes
|
||||||
command: |
|
command: |
|
||||||
exit 0
|
exit 0
|
||||||
if ! git diff --exit-code agent/bindata_assetfs.go; then
|
if ! git diff --exit-code agent/uiserver/bindata_assetfs.go; then
|
||||||
git config --local user.email "hashicorp-ci@users.noreply.github.com"
|
git config --local user.email "hashicorp-ci@users.noreply.github.com"
|
||||||
git config --local user.name "hashicorp-ci"
|
git config --local user.name "hashicorp-ci"
|
||||||
|
|
||||||
short_sha=$(git rev-parse --short HEAD)
|
short_sha=$(git rev-parse --short HEAD)
|
||||||
git add agent/bindata_assetfs.go
|
git add agent/uiserver/bindata_assetfs.go
|
||||||
git commit -m "auto-updated agent/bindata_assetfs.go from commit ${short_sha}"
|
git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}"
|
||||||
git push origin master
|
git push origin master
|
||||||
else
|
else
|
||||||
echo "no new static assets to publish"
|
echo "no new static assets to publish"
|
||||||
|
|
|
@ -16,7 +16,7 @@ GOARCH?=$(shell go env GOARCH)
|
||||||
GOPATH=$(shell go env GOPATH)
|
GOPATH=$(shell go env GOPATH)
|
||||||
MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
|
MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
|
||||||
|
|
||||||
ASSETFS_PATH?=agent/bindata_assetfs.go
|
ASSETFS_PATH?=agent/uiserver/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_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
|
||||||
|
|
|
@ -7,7 +7,7 @@ import (
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
// bufferedFile implements os.File and allows us to modify a file from disk by
|
// bufferedFile implements http.File and allows us to modify a file from disk by
|
||||||
// writing out the new version into a buffer and then serving file reads from
|
// writing out the new version into a buffer and then serving file reads from
|
||||||
// that.
|
// that.
|
||||||
type bufferedFile struct {
|
type bufferedFile struct {
|
||||||
|
|
|
@ -477,7 +477,7 @@ function build_release {
|
||||||
|
|
||||||
if is_set "${do_tag}"
|
if is_set "${do_tag}"
|
||||||
then
|
then
|
||||||
git add "${sdir}/agent/bindata_assetfs.go"
|
git add "${sdir}/agent/uiserver/bindata_assetfs.go"
|
||||||
if test $? -ne 0
|
if test $? -ne 0
|
||||||
then
|
then
|
||||||
err "ERROR: Failed to git add the assetfs file"
|
err "ERROR: Failed to git add the assetfs file"
|
||||||
|
|
|
@ -99,7 +99,7 @@ function confirm_git_push_changes {
|
||||||
;;
|
;;
|
||||||
?)
|
?)
|
||||||
# bindata_assetfs.go will make these meaningless
|
# bindata_assetfs.go will make these meaningless
|
||||||
git_diff "$(pwd)" ":!agent/bindata_assetfs.go"|| ret 1
|
git_diff "$(pwd)" ":!agent/uiserver/bindata_assetfs.go"|| ret 1
|
||||||
answer=""
|
answer=""
|
||||||
;;
|
;;
|
||||||
* )
|
* )
|
||||||
|
|
|
@ -39,6 +39,6 @@ github_checks:
|
||||||
annotations: false
|
annotations: false
|
||||||
|
|
||||||
ignore:
|
ignore:
|
||||||
- "agent/bindata_assetfs.go"
|
- "agent/uiserver/bindata_assetfs.go"
|
||||||
- "vendor/**/*"
|
- "vendor/**/*"
|
||||||
- "**/*.pb.go"
|
- "**/*.pb.go"
|
||||||
|
|
Loading…
Reference in New Issue