Skip to content

Commit 3b8125a

Browse files
committed
Update all the references in CI and makefile to the bindata file location
1 parent 3ff5901 commit 3b8125a

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.circleci/config.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,7 @@ jobs:
626626
- persist_to_workspace:
627627
root: .
628628
paths:
629-
- ./agent/bindata_assetfs.go
629+
- ./agent/uiserver/bindata_assetfs.go
630630
- run: *notify-slack-failure
631631

632632
# commits static assets to git
@@ -641,16 +641,16 @@ jobs:
641641
- attach_workspace:
642642
at: .
643643
- run:
644-
name: commit agent/bindata_assetfs.go if there are changes
644+
name: commit agent/uiserver/bindata_assetfs.go if there are changes
645645
command: |
646646
exit 0
647-
if ! git diff --exit-code agent/bindata_assetfs.go; then
647+
if ! git diff --exit-code agent/uiserver/bindata_assetfs.go; then
648648
git config --local user.email "[email protected]"
649649
git config --local user.name "hashicorp-ci"
650650
651651
short_sha=$(git rev-parse --short HEAD)
652-
git add agent/bindata_assetfs.go
653-
git commit -m "auto-updated agent/bindata_assetfs.go from commit ${short_sha}"
652+
git add agent/uiserver/bindata_assetfs.go
653+
git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}"
654654
git push origin master
655655
else
656656
echo "no new static assets to publish"

GNUmakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GOARCH?=$(shell go env GOARCH)
1616
GOPATH=$(shell go env GOPATH)
1717
MAIN_GOPATH=$(shell go env GOPATH | cut -d: -f1)
1818

19-
ASSETFS_PATH?=agent/bindata_assetfs.go
19+
ASSETFS_PATH?=agent/uiserver/bindata_assetfs.go
2020
# Get the git commit
2121
GIT_COMMIT?=$(shell git rev-parse --short HEAD)
2222
GIT_COMMIT_YEAR?=$(shell git show -s --format=%cd --date=format:%Y HEAD)

agent/uiserver/buffered_file.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88
)
99

10-
// bufferedFile implements os.File and allows us to modify a file from disk by
10+
// bufferedFile implements http.File and allows us to modify a file from disk by
1111
// writing out the new version into a buffer and then serving file reads from
1212
// that.
1313
type bufferedFile struct {

build-support/functions/30-release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ function build_release {
477477

478478
if is_set "${do_tag}"
479479
then
480-
git add "${sdir}/agent/bindata_assetfs.go"
480+
git add "${sdir}/agent/uiserver/bindata_assetfs.go"
481481
if test $? -ne 0
482482
then
483483
err "ERROR: Failed to git add the assetfs file"

build-support/functions/40-publish.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ function confirm_git_push_changes {
9999
;;
100100
?)
101101
# bindata_assetfs.go will make these meaningless
102-
git_diff "$(pwd)" ":!agent/bindata_assetfs.go"|| ret 1
102+
git_diff "$(pwd)" ":!agent/uiserver/bindata_assetfs.go"|| ret 1
103103
answer=""
104104
;;
105105
* )

codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ github_checks:
3939
annotations: false
4040

4141
ignore:
42-
- "agent/bindata_assetfs.go"
42+
- "agent/uiserver/bindata_assetfs.go"
4343
- "vendor/**/*"
4444
- "**/*.pb.go"

0 commit comments

Comments
 (0)