[autoroll] Fixes
- Add back dependency on skiaversion. It's removed in a dedicated CL.
- Fix resources path.
Change-Id: I5e30f432977da2b0b9e8e9e72b361ab556cd9bf9
Reviewed-on: https://skia-review.googlesource.com/c/buildbot/+/302876
Reviewed-by: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
diff --git a/autoroll/Makefile b/autoroll/Makefile
index 797bebe..bb1602a 100644
--- a/autoroll/Makefile
+++ b/autoroll/Makefile
@@ -2,20 +2,21 @@
# containing the same, and generate, apply, and push Kubernetes configs
# for the autorollers.
+include ../go/skiaversion/skiaversion.mk
include ../kube/kube.mk
.PHONY: autoroll-fe
-autoroll-fe:
+autoroll-fe: skiaversion
npm ci
npx webpack --mode=production
CGO_ENABLED=0 GOOS=linux go install -a ./go/autoroll-fe
.PHONY: autoroll-be
-autoroll-be:
+autoroll-be: skiaversion
GOOS=linux go install -a ./go/autoroll-be
.PHONY: autoroll-google3
-autoroll-google3:
+autoroll-google3: skiaversion
CGO_ENABLED=0 GOOS=linux go install -a ./go/autoroll-google3
.PHONY: all
diff --git a/autoroll/go/autoroll-fe/autoroll-fe.yaml.template b/autoroll/go/autoroll-fe/autoroll-fe.yaml.template
index 7f907ad..92cc308 100644
--- a/autoroll/go/autoroll-fe/autoroll-fe.yaml.template
+++ b/autoroll/go/autoroll-fe/autoroll-fe.yaml.template
@@ -50,7 +50,7 @@
- "--host={{.hostName}}"
- "--port=:8000"
- "--prom_port=:20000"
- - "--resources_dir=/usr/local/share/autoroll"{{if eq .internal "true"}}
+ - "--resources_dir=/usr/local/share/autoroll-fe/dist"{{if eq .internal "true"}}
- "--internal"{{end}}{{- range $index, $config := .configs}}
- "--config={{$config.base64}}"{{- end}}
ports:
