mirror of https://github.com/status-im/consul.git
Update all the references in CI and makefile to the bindata file location
This commit is contained in:
parent
3ff5901be8
commit
3b8125a24d
|
@ -626,7 +626,7 @@ jobs:
|
|||
- persist_to_workspace:
|
||||
root: .
|
||||
paths:
|
||||
- ./agent/bindata_assetfs.go
|
||||
- ./agent/uiserver/bindata_assetfs.go
|
||||
- run: *notify-slack-failure
|
||||
|
||||
# commits static assets to git
|
||||
|
@ -641,16 +641,16 @@ jobs:
|
|||
- attach_workspace:
|
||||
at: .
|
||||
- run:
|
||||
name: commit agent/bindata_assetfs.go if there are changes
|
||||
name: commit agent/uiserver/bindata_assetfs.go if there are changes
|
||||
command: |
|
||||
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.name "hashicorp-ci"
|
||||
|
||||
short_sha=$(git rev-parse --short HEAD)
|
||||
git add agent/bindata_assetfs.go
|
||||
git commit -m "auto-updated agent/bindata_assetfs.go from commit ${short_sha}"
|
||||
git add agent/uiserver/bindata_assetfs.go
|
||||
git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}"
|
||||
git push origin master
|
||||
else
|
||||
echo "no new static assets to publish"
|
||||
|
|
|
@ -16,7 +16,7 @@ GOARCH?=$(shell go env GOARCH)
|
|||
GOPATH=$(shell go env GOPATH)
|
||||
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
|
||||
GIT_COMMIT?=$(shell git rev-parse --short HEAD)
|
||||
GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"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
|
||||
// that.
|
||||
type bufferedFile struct {
|
||||
|
|
|
@ -477,7 +477,7 @@ function build_release {
|
|||
|
||||
if is_set "${do_tag}"
|
||||
then
|
||||
git add "${sdir}/agent/bindata_assetfs.go"
|
||||
git add "${sdir}/agent/uiserver/bindata_assetfs.go"
|
||||
if test $? -ne 0
|
||||
then
|
||||
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
|
||||
git_diff "$(pwd)" ":!agent/bindata_assetfs.go"|| ret 1
|
||||
git_diff "$(pwd)" ":!agent/uiserver/bindata_assetfs.go"|| ret 1
|
||||
answer=""
|
||||
;;
|
||||
* )
|
||||
|
|
|
@ -39,6 +39,6 @@ github_checks:
|
|||
annotations: false
|
||||
|
||||
ignore:
|
||||
- "agent/bindata_assetfs.go"
|
||||
- "agent/uiserver/bindata_assetfs.go"
|
||||
- "vendor/**/*"
|
||||
- "**/*.pb.go"
|
||||
|
|
Loading…
Reference in New Issue