From 33723f8a85871797b6f38ab0340437a9b635f917 Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Thu, 25 Mar 2021 15:45:08 +1100
Subject: Remove .GOPATH symlinks

Simplifies Makefiles to not use `.GOPATH` symlink.
Updates `test.yaml` to reuse the Go cache in between jobs instead of
removing and downloading all the dependencies for every job.

Changelog: other
---
 .gitlab/ci/test.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to '.gitlab')

diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 74d49ee6..609c7d7d 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -11,15 +11,13 @@
 .tests-unit:
   extends: .tests-common
   script:
-    - echo "Running all tests without daemonizing..."
-    - make setup
-    - make test
+    - echo "Running all unit tests without daemonizing..."
+    - make test ARGS='-short'
     - make junit-report
 
 .tests-acceptance-deamon:
   extends: .tests-common
   script:
-    - make setup
     - echo "Running just the acceptance tests daemonized (tmpdir)...."
     - TEST_DAEMONIZE=tmpdir make acceptance
     - echo "Running just the acceptance tests daemonized (inplace)...."
@@ -58,7 +56,6 @@ race:
 cover:
   extends: .tests-common
   script:
-    - make setup
     - make generate-mocks
     - make cover
   coverage: '/total:.+\(statements\).+\d+\.\d+/'
-- 
cgit v1.2.3


From 63488757fe9c8eba78a0abc497f1f368f225d42d Mon Sep 17 00:00:00 2001
From: Jaime Martinez <jmartinez@gitlab.com>
Date: Fri, 26 Mar 2021 08:17:38 +1100
Subject: Add note about tools.go

---
 .gitlab/ci/test.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitlab')

diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 609c7d7d..4ca9a29e 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -43,6 +43,7 @@ test-acceptance:1.14:
 test:1.15:
   extends: .tests-unit
   image: golang:1.15
+
 test-acceptance:1.15:
   extends: .tests-acceptance-deamon
   image: golang:1.15
-- 
cgit v1.2.3