From ce3d6e1b5373046d3440be45782ff8ded5c405fc Mon Sep 17 00:00:00 2001
From: Brendan Abolivier <babolivier@matrix.org>
Date: Tue, 21 May 2019 17:54:31 +0100
Subject: [PATCH] First attempt at fixing CI

---
 .travis.yml                    |  5 +----
 scripts/build-test-lint.sh     | 10 +++-------
 scripts/find-lint.sh           |  2 +-
 scripts/install-local-kafka.sh |  2 +-
 scripts/travis-test.sh         | 24 ++++++------------------
 5 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d4bab9df4..8d5c3a137 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: go
 go:
- - 1.10.x
  - 1.11.x
+ - 1.12.x
 
 env:
 - TEST_SUITE="lint"
@@ -23,9 +23,6 @@ cache:
   directories:
     - .downloads
 
-install:
- - go get github.com/constabulary/gb/...
-
 script:
  - ./scripts/travis-test.sh
 
diff --git a/scripts/build-test-lint.sh b/scripts/build-test-lint.sh
index f283017fd..96c751377 100755
--- a/scripts/build-test-lint.sh
+++ b/scripts/build-test-lint.sh
@@ -4,20 +4,16 @@
 
 set -eu
 
-export GOPATH="$(pwd):$(pwd)/vendor"
-export PATH="$PATH:$(pwd)/bin"
-
 echo "Checking that it builds"
 gb build
 
 # Check that all the packages can build.
 # When `go build` is given multiple packages it won't output anything, and just
-# checks that everything builds. This seems to do a better job of handling
-# missing imports than `gb build` does.
+# checks that everything builds.
 echo "Double checking it builds..."
-go build github.com/matrix-org/dendrite/cmd/...
+go build ./cmd/...
 
 ./scripts/find-lint.sh
 
 echo "Testing..."
-gb test
+go test ./...
diff --git a/scripts/find-lint.sh b/scripts/find-lint.sh
index 3b1cbac61..de97a8446 100755
--- a/scripts/find-lint.sh
+++ b/scripts/find-lint.sh
@@ -36,7 +36,7 @@ then args="$args --enable-gc"
 fi
 
 echo "Installing lint search engine..."
-gb build github.com/alecthomas/gometalinter/
+go get github.com/alecthomas/gometalinter/
 gometalinter --config=linter.json ./... --install
 
 echo "Looking for lint..."
diff --git a/scripts/install-local-kafka.sh b/scripts/install-local-kafka.sh
index 19ce09117..4669a0fc1 100755
--- a/scripts/install-local-kafka.sh
+++ b/scripts/install-local-kafka.sh
@@ -1,4 +1,4 @@
-# /bin/bash
+#! /bin/bash
 
 # Downloads, installs and runs a kafka instance
 
diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh
index 2d0332153..1d5d05511 100755
--- a/scripts/travis-test.sh
+++ b/scripts/travis-test.sh
@@ -12,8 +12,7 @@ set -eu
 export GOGC=400
 export DENDRITE_LINT_DISABLE_GC=1
 
-export GOPATH="$(pwd):$(pwd)/vendor"
-export PATH="$PATH:$(pwd)/bin"
+export GO111MODULE=on
 
 # starts a travis fold section. The first argument is the name of the fold
 # section (which appears on the RHS) and may contain no spaces. Remaining
@@ -55,25 +54,14 @@ if [ "${TEST_SUITE:-unit-test}" == "unit-test" ]; then
 fi
 
 if [ "${TEST_SUITE:-integ-test}" == "integ-test" ]; then
-    travis_start gb-build "Building dendrite and integ tests"
-    gb build
+    travis_start go-build "Building dendrite and integ tests"
+    go install ./cmd/...
     travis_end
     
     # Check that all the packages can build.
     # When `go build` is given multiple packages it won't output anything, and just
-    # checks that everything builds. This seems to do a better job of handling
-    # missing imports than `gb build` does.
-    go build github.com/matrix-org/dendrite/cmd/...
-
-    # Check that the servers build (this is done explicitly because `gb build` can silently fail (exit 0) and then we'd test a stale binary)
-    gb build github.com/matrix-org/dendrite/cmd/dendrite-room-server
-    gb build github.com/matrix-org/dendrite/cmd/roomserver-integration-tests
-    gb build github.com/matrix-org/dendrite/cmd/dendrite-sync-api-server
-    gb build github.com/matrix-org/dendrite/cmd/syncserver-integration-tests
-    gb build github.com/matrix-org/dendrite/cmd/create-account
-    gb build github.com/matrix-org/dendrite/cmd/dendrite-media-api-server
-    gb build github.com/matrix-org/dendrite/cmd/mediaapi-integration-tests
-    gb build github.com/matrix-org/dendrite/cmd/client-api-proxy
+    # checks that everything builds.
+    go build ./cmd/...
 
     # Create necessary certificates and keys to run dendrite
     travis_start certs "Building SSL certs"
@@ -92,7 +80,7 @@ if [ "${TEST_SUITE:-integ-test}" == "integ-test" ]; then
     # Run the integration tests
     for i in roomserver syncserver mediaapi; do
         travis_start "$i-integration-tests" "Running integration tests for $i"
-        bin/$i-integration-tests
+        $i-integration-tests
         travis_end
     done
 fi