From 35595d2a95a54ea809dc5eb3fc23ac93df071aec Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 4 Oct 2018 21:07:46 +0200 Subject: [PATCH 01/16] Use cireclci machines --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d8d10e9..497fadd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,7 @@ version: 2 jobs: build: + machine: true working_directory: /go/src/github.com/solidnerd/gogpat docker: - image: circleci/golang:1.10 From 5494e58e118c4bcea85430836a4d20c6647ab59f Mon Sep 17 00:00:00 2001 From: solidnerd Date: Thu, 4 Oct 2018 21:10:34 +0200 Subject: [PATCH 02/16] Use machine only --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 497fadd..0098cc4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,14 +3,11 @@ jobs: build: machine: true working_directory: /go/src/github.com/solidnerd/gogpat - docker: - - image: circleci/golang:1.10 steps: - checkout - restore_cache: keys: - v1-pkg-cache - - setup_remote_docker - run: make ci - save_cache: key: v1-pkg-cache From cddef87c9a307ced1f51683db70e08f04006ecb2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 12:01:58 +0200 Subject: [PATCH 03/16] Remove working dir --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0098cc4..655c582 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,6 @@ version: 2 jobs: build: machine: true - working_directory: /go/src/github.com/solidnerd/gogpat steps: - checkout - restore_cache: From 8e6489d5c4285b29736f2239a16dc1615f43e3f9 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 12:07:41 +0200 Subject: [PATCH 04/16] Update gopath --- .circleci/config.yml | 2 ++ ci/prepare.sh | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 ci/prepare.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 655c582..36db77d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,6 +7,8 @@ jobs: - restore_cache: keys: - v1-pkg-cache + - run: ci/prepare.sh + - run: cd $GOPATH/src/${CIRCLE_REPOSITORY_URL#https://} - run: make ci - save_cache: key: v1-pkg-cache diff --git a/ci/prepare.sh b/ci/prepare.sh new file mode 100644 index 0000000..6ee3d8d --- /dev/null +++ b/ci/prepare.sh @@ -0,0 +1,5 @@ +#!/bin/bash +GODIR=$GOPATH/src/${CIRCLE_REPOSITORY_URL#https://} +mkdir -p "$(dirname "$GODIR")" +ln -sfv "$(pwd -P)" "$GODIR" +cd $GODIR From d65fffcbdfa0a78a7f3fc92ab67fe5efba321070 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 12:08:44 +0200 Subject: [PATCH 05/16] Fix permission --- ci/prepare.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ci/prepare.sh diff --git a/ci/prepare.sh b/ci/prepare.sh old mode 100644 new mode 100755 From 018d5955b2ea20a2e8d2c4e5f20d457d51a26a68 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 19:54:42 +0200 Subject: [PATCH 06/16] Test working dir again Signed-off-by: solidnerd --- .circleci/config.yml | 3 +-- ci/prepare.sh | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100755 ci/prepare.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 36db77d..517bb06 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,13 +2,12 @@ version: 2 jobs: build: machine: true + working_directory: ~/go/src/github.com/solidnerd/gogpat steps: - checkout - restore_cache: keys: - v1-pkg-cache - - run: ci/prepare.sh - - run: cd $GOPATH/src/${CIRCLE_REPOSITORY_URL#https://} - run: make ci - save_cache: key: v1-pkg-cache diff --git a/ci/prepare.sh b/ci/prepare.sh deleted file mode 100755 index 6ee3d8d..0000000 --- a/ci/prepare.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -GODIR=$GOPATH/src/${CIRCLE_REPOSITORY_URL#https://} -mkdir -p "$(dirname "$GODIR")" -ln -sfv "$(pwd -P)" "$GODIR" -cd $GODIR From f0b62b9f8984968935d2e9e87bfffb9ee6b0c692 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 19:58:08 +0200 Subject: [PATCH 07/16] Run test direct --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 517bb06..60d4957 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - restore_cache: keys: - v1-pkg-cache - - run: make ci + - run: ci/test.sh $(go list ... | grep -v /vendor/) - save_cache: key: v1-pkg-cache paths: From 5417d2ab87dc48a2df97ac0ced9590fb23e7d9d1 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 20:13:04 +0200 Subject: [PATCH 08/16] Use latest gitlab version to test if gogpat works --- ci/test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/test.sh b/ci/test.sh index 8f7ffca..df7a51d 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -3,9 +3,9 @@ set -eu PKG_LIST=$1 versions=( \ - 10.2.5 \ - 10.8.4 \ - 11.0.2 \ + 11.1.4 \ + 11.2.3 \ + 11.3.4 \ ) for version in "${versions[@]}"; do From 7f0260801094d6f660787e108bb713a15ce1f8a0 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Sun, 14 Oct 2018 20:23:29 +0200 Subject: [PATCH 09/16] Test the correct package --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60d4957..b669191 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,7 +8,7 @@ jobs: - restore_cache: keys: - v1-pkg-cache - - run: ci/test.sh $(go list ... | grep -v /vendor/) + - run: ci/test.sh $(go list ./... | grep -v vendor) - save_cache: key: v1-pkg-cache paths: From eba3137117dd58aa37c4b2abac7f2f0508f8d6da Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:22:13 +0100 Subject: [PATCH 10/16] Link working dir --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b669191..cc5de60 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,7 @@ jobs: - restore_cache: keys: - v1-pkg-cache + - run: ln -sn $CIRCLE_WORKING_DIRECTORY ~/go/src/github.com/solidnerd/gogpat - run: ci/test.sh $(go list ./... | grep -v vendor) - save_cache: key: v1-pkg-cache From 30b9e51e4dfad94ece96a46fc87b10d375d93997 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:26:15 +0100 Subject: [PATCH 11/16] Add debug info --- ci/test.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ci/test.sh b/ci/test.sh index df7a51d..e1cc2b6 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -9,14 +9,15 @@ versions=( \ ) for version in "${versions[@]}"; do - pushd ci - printf "Testing with GitLab $version\n\n" - GITLAB_VERSION=${version} docker-compose up -d - until curl -sSf http://localhost:10080/explore > /dev/null - do - sleep 10 - done - popd + # pushd ci + # printf "Testing with GitLab $version\n\n" + # GITLAB_VERSION=${version} docker-compose up -d + # until curl -sSf http://localhost:10080/explore > /dev/null + # do + # sleep 10 + # done + # popd + echo "$PKG_LIST" printf "Testing...\n\n" go test -v -covermode=count -coverprofile=profile.cov -timeout=1200s ${PKG_LIST} pushd ci From 57315226b6761008bce350b797d3bac30e66bba2 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:29:07 +0100 Subject: [PATCH 12/16] test --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cc5de60..afc4f8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: keys: - v1-pkg-cache - run: ln -sn $CIRCLE_WORKING_DIRECTORY ~/go/src/github.com/solidnerd/gogpat - - run: ci/test.sh $(go list ./... | grep -v vendor) + - run: ci/test.sh $(go list . | grep -v vendor) - save_cache: key: v1-pkg-cache paths: From bfb8fe34205355ab589b7702f4f8c1ae88db8602 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:37:34 +0100 Subject: [PATCH 13/16] Update again --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index afc4f8f..e10753e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,14 +2,13 @@ version: 2 jobs: build: machine: true - working_directory: ~/go/src/github.com/solidnerd/gogpat + working_directory: /go/src/github.com/solidnerd/gogpat steps: - checkout - restore_cache: keys: - v1-pkg-cache - - run: ln -sn $CIRCLE_WORKING_DIRECTORY ~/go/src/github.com/solidnerd/gogpat - - run: ci/test.sh $(go list . | grep -v vendor) + - run: ci/test.sh $(go list ./... | grep -v vendor) - save_cache: key: v1-pkg-cache paths: From 0c6730e2fad7f339ba00ada99711a490b5cd26a8 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:40:04 +0100 Subject: [PATCH 14/16] Add debug --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e10753e..5c142d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,12 +2,13 @@ version: 2 jobs: build: machine: true - working_directory: /go/src/github.com/solidnerd/gogpat + working_directory: ~/go/src/github.com/solidnerd/gogpat steps: - checkout - restore_cache: keys: - v1-pkg-cache + - run: ls -alh - run: ci/test.sh $(go list ./... | grep -v vendor) - save_cache: key: v1-pkg-cache From 2a3c5a6c605437b7397765e48db52f24082494cb Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:42:51 +0100 Subject: [PATCH 15/16] Test again --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c142d9..d84c2ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,7 @@ jobs: keys: - v1-pkg-cache - run: ls -alh + - run: pwd - run: ci/test.sh $(go list ./... | grep -v vendor) - save_cache: key: v1-pkg-cache From 37736ba5c89f7aacf14a97f09854ce7388494d04 Mon Sep 17 00:00:00 2001 From: solidnerd Date: Tue, 30 Oct 2018 20:44:47 +0100 Subject: [PATCH 16/16] Test again --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d84c2ab..d3c32c7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,6 @@ version: 2 jobs: build: machine: true - working_directory: ~/go/src/github.com/solidnerd/gogpat steps: - checkout - restore_cache: