Improving CI and updated go-bindata.

kristofferahl · Jan 22, 2021 · 5d5c081 · 5d5c081
1 parent 0663799
commit 5d5c081
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
         go-version: 1.15
 
     - name: Build
-      run: go build -v ./...
+      run: ./scripts/build
 
     - name: Test
-      run: go test -v ./...
+      run: ./scripts/test
diff --git a/internal/pkg/config/schema.go b/internal/pkg/config/schema.go
diff --git a/scripts/build b/scripts/build
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+scripts/make-schema
+go build -v ./...
diff --git a/scripts/make-schema b/scripts/make-schema
@@ -1,3 +1,12 @@
 #!/usr/bin/env bash
 
-go-bindata -pkg config -o internal/pkg/config/schema.go schemas/manifest.json
+declare gobindata
+gobindata="$(which go-bindata)"
+
+if ! "${gobindata}" -v &>/dev/null; then
+  gobindata='./go-bindata'
+  curl --silent --location --output "${gobindata:?}" https://github.com/kevinburke/go-bindata/releases/download/v3.22.0/go-bindata-linux-amd64
+  chmod 755 "${gobindata:?}"
+fi
+
+"${gobindata:?}" -pkg config -o internal/pkg/config/schema.go schemas/manifest.json
diff --git a/scripts/test b/scripts/test
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -euo pipefail
 
 scripts/make-schema
-go test ./...
+go test -v ./...