Merge branch 'fix-builds'

utilitywarehouse · Feb 4, 2020 · 8ed7b8c · 8ed7b8c
2 parents 31454d9 + 7c12ea5
commit 8ed7b8c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,9 @@ language: go
 go:
 - "1.13.x"
 
+env:
+  global: CGO_ENABLED=0
+
 matrix:
   fast_finish: true
   allow_failures:

diff --git a/scripts/docscheck.sh b/scripts/docscheck.sh
@@ -4,9 +4,9 @@ set -eou pipefail
 
 echo "==> Extracting provider json schema..."
 tmpd=$(mktemp -d)
-go build -o $tmpd .
+go build -o "${tmpd}" .
 (
-    cd $tmpd
+    cd "${tmpd}"
     echo "provider ${PROVIDER_NAME} {}" > main.tf
 
     docker run \
@@ -16,7 +16,7 @@ go build -o $tmpd .
         --volume "${tmpd}:/out" \
         --workdir /out \
         hashicorp/terraform \
-        init 2>&1 >/dev/null
+        init >/dev/null 2>&1
 
     docker run \
         --interactive \
@@ -28,7 +28,7 @@ go build -o $tmpd .
         providers schema -json > schema.json
 
     rm main.tf
-    rm terraform-provider-${PROVIDER_NAME}
+    rm "terraform-provider-${PROVIDER_NAME}"
 )
 
 echo "==> Checking docs with tfproviderdocs..."