From 531957c51f228f923bc184858aa6c8e6e60fe8ed Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 16:05:43 -0600 Subject: [PATCH 01/26] hope --- .gitlab/.gitlab-ci.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index ee4ec0bd2..c04d3b02f 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -36,14 +36,6 @@ golangci-lint: - echo "Checking for issues in new code" - golangci-lint run -v -install lattice: - stage: test - image: node:14 - script: - - echo "Installing lattice dependencies..." - - cd lattice - - yarn install - build lattice: stage: test image: node:14 @@ -52,13 +44,12 @@ build lattice: script: - echo "Building lattice..." - cd lattice + - yarn install - yarn build - tar -czvf lattice.tar.gz lattice/build artifacts: paths: - lattice/lattice.tar.gz - needs: - - job: install lattice allow_failure: true run jest tests: From d449c8449fbf76b486c1ef34d77ac9d05997a511 Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 16:17:38 -0600 Subject: [PATCH 02/26] don't treat warnings as errors --- .gitlab/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index c04d3b02f..f6c6c3cd2 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -40,7 +40,7 @@ build lattice: stage: test image: node:14 variables: - CI: "true" + CI: "false" script: - echo "Building lattice..." - cd lattice From 58c01793cb1d83311a312226fb5a0b092e1a5223 Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 16:25:51 -0600 Subject: [PATCH 03/26] this ought to do it --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index f6c6c3cd2..286c46da2 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -46,11 +46,11 @@ build lattice: - cd lattice - yarn install - yarn build + - cd ../ - tar -czvf lattice.tar.gz lattice/build artifacts: paths: - - lattice/lattice.tar.gz - allow_failure: true + - lattice.tar.gz run jest tests: stage: test From bd209b3005e86cd805aa11b026989bcfa3e977fc Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 16:46:10 -0600 Subject: [PATCH 04/26] please god work --- .gitlab/.gitlab-ci.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 286c46da2..15b154c5b 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -101,13 +101,16 @@ upload to sonarcloud: build for linux amd64: stage: build - image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 + image: golang:1.16.10 extends: .go-cache variables: GOOS: "linux" GOARCH: "amd64" script: - - go build -o featurebase_linux_amd64 ./cmd/featurebase + - go get github.com/rakyll/statik + - tar -xzvf lattice.tar.gz + - /go/bin/statik -src=./lattice -dest=. + - make build FLAGS="-o featurebase_linux_amd64" artifacts: paths: - featurebase_linux_amd64 @@ -120,7 +123,10 @@ build for linux arm64: GOOS: "linux" GOARCH: "arm64" script: - - go build -o featurebase_linux_arm64 ./cmd/featurebase + - go get github.com/rakyll/statik + - tar -xzvf lattice.tar.gz + - /go/bin/statik -src=./lattice -dest=. + - make build FLAGS="-o featurebase_linux_arm64" artifacts: paths: - featurebase_linux_arm64 @@ -133,7 +139,10 @@ build for darwin amd64: GOOS: "darwin" GOARCH: "amd64" script: - - go build -o featurebase_darwin_amd64 ./cmd/featurebase + - go get github.com/rakyll/statik + - tar -xzvf lattice.tar.gz + - /go/bin/statik -src=./lattice -dest=. + - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: - featurebase_darwin_amd64 @@ -146,7 +155,10 @@ build for darwin arm64: GOOS: "darwin" GOARCH: "arm64" script: - - go build -o featurebase_darwin_arm64 ./cmd/featurebase + - go get github.com/rakyll/statik + - tar -xzvf lattice.tar.gz + - /go/bin/statik -src=./lattice -dest=. + - make build FLAGS="-o featurebase_darwin_arm64" artifacts: paths: - featurebase_darwin_arm64 From 37866204d74f6c04c45c8e85a22901b30bc8f6ba Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 17:09:14 -0600 Subject: [PATCH 05/26] use statik right --- .gitlab/.gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 15b154c5b..d3c468df5 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -109,7 +109,7 @@ build for linux amd64: script: - go get github.com/rakyll/statik - tar -xzvf lattice.tar.gz - - /go/bin/statik -src=./lattice -dest=. + - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_linux_amd64" artifacts: paths: @@ -125,7 +125,7 @@ build for linux arm64: script: - go get github.com/rakyll/statik - tar -xzvf lattice.tar.gz - - /go/bin/statik -src=./lattice -dest=. + - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_linux_arm64" artifacts: paths: @@ -141,7 +141,7 @@ build for darwin amd64: script: - go get github.com/rakyll/statik - tar -xzvf lattice.tar.gz - - /go/bin/statik -src=./lattice -dest=. + - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: @@ -157,7 +157,7 @@ build for darwin arm64: script: - go get github.com/rakyll/statik - tar -xzvf lattice.tar.gz - - /go/bin/statik -src=./lattice -dest=. + - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_arm64" artifacts: paths: From 0ab58b9132d4c834b1a555fc26a38d4a1461c41a Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 17:23:34 -0600 Subject: [PATCH 06/26] untar properly --- .gitlab/.gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index d3c468df5..462977fa6 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -108,7 +108,7 @@ build for linux amd64: GOARCH: "amd64" script: - go get github.com/rakyll/statik - - tar -xzvf lattice.tar.gz + - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_linux_amd64" artifacts: @@ -124,7 +124,7 @@ build for linux arm64: GOARCH: "arm64" script: - go get github.com/rakyll/statik - - tar -xzvf lattice.tar.gz + - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_linux_arm64" artifacts: @@ -140,7 +140,7 @@ build for darwin amd64: GOARCH: "amd64" script: - go get github.com/rakyll/statik - - tar -xzvf lattice.tar.gz + - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: @@ -156,7 +156,7 @@ build for darwin arm64: GOARCH: "arm64" script: - go get github.com/rakyll/statik - - tar -xzvf lattice.tar.gz + - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_arm64" artifacts: From 61d558de3cbaedff357fd7081076d628411e2924 Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 17:40:28 -0600 Subject: [PATCH 07/26] update tests, actually install statik smh my head --- .gitlab/.gitlab-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 462977fa6..0f1f4bc3c 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -68,7 +68,7 @@ run jest tests: run go tests: stage: test - image: golang:1.16.9 + image: golang:1.16.10 extends: .go-cache script: - echo "Running featurebase unit tests..." @@ -79,7 +79,7 @@ run go tests: run go tests with output: stage: test - image: golang:1.16.9 + image: golang:1.16.10 script: - echo "Running featurebase unit tests to capture JSON output..." - go test -json > test-report.out @@ -108,6 +108,7 @@ build for linux amd64: GOARCH: "amd64" script: - go get github.com/rakyll/statik + - go install github.com/rakyll/statik@latest - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_linux_amd64" @@ -124,6 +125,7 @@ build for linux arm64: GOARCH: "arm64" script: - go get github.com/rakyll/statik + - go install github.com/rakyll/statik@latest - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_linux_arm64" @@ -140,6 +142,7 @@ build for darwin amd64: GOARCH: "amd64" script: - go get github.com/rakyll/statik + - go install github.com/rakyll/statik@latest - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" @@ -156,6 +159,7 @@ build for darwin arm64: GOARCH: "arm64" script: - go get github.com/rakyll/statik + - go install github.com/rakyll/statik@latest - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_arm64" From 640d12cb6cb03b80aed96a531acdbd338cf0c907 Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 17:54:26 -0600 Subject: [PATCH 08/26] debug by print statmeentS --- .gitlab/.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 0f1f4bc3c..9f09e035e 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -143,8 +143,10 @@ build for darwin amd64: script: - go get github.com/rakyll/statik - go install github.com/rakyll/statik@latest + - /go/bin/statik -h - tar -xvf lattice.tar.gz - /go/bin/statik -src=lattice + - ls - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 1337a9dfaa4d12775d4ebcc7e4bcced4985d6248 Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 18:12:27 -0600 Subject: [PATCH 09/26] more debugging by print statement --- .gitlab/.gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 9f09e035e..23ce3b36b 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -141,12 +141,14 @@ build for darwin amd64: GOOS: "darwin" GOARCH: "amd64" script: + - tar -xvf lattice.tar.gz + - ls - go get github.com/rakyll/statik - go install github.com/rakyll/statik@latest - - /go/bin/statik -h - - tar -xvf lattice.tar.gz + - ls -al /go + - which statik + - ls -al /go/bin - /go/bin/statik -src=lattice - - ls - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From b28c9feef04f3881b214fb62636f6156ffd6e9df Mon Sep 17 00:00:00 2001 From: reesporte Date: Thu, 11 Nov 2021 18:28:20 -0600 Subject: [PATCH 10/26] more print debug --- .gitlab/.gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 23ce3b36b..b7040a3c1 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -141,12 +141,10 @@ build for darwin amd64: GOOS: "darwin" GOARCH: "amd64" script: + - rm -r lattice - tar -xvf lattice.tar.gz - - ls - go get github.com/rakyll/statik - go install github.com/rakyll/statik@latest - - ls -al /go - - which statik - ls -al /go/bin - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" From a214ac5dedb97cbe8b00b94af017a2f164ac8a5e Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 11:46:52 -0600 Subject: [PATCH 11/26] verbose statik install --- .gitlab/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index b7040a3c1..538d32e97 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -144,7 +144,7 @@ build for darwin amd64: - rm -r lattice - tar -xvf lattice.tar.gz - go get github.com/rakyll/statik - - go install github.com/rakyll/statik@latest + - go install -v github.com/rakyll/statik@latest - ls -al /go/bin - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" From 14e9fb1ff14897ef7c9f1af57c0af12fa9275ad1 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 12:02:45 -0600 Subject: [PATCH 12/26] statik h --- .gitlab/.gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 538d32e97..d9e79826d 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -144,9 +144,9 @@ build for darwin amd64: - rm -r lattice - tar -xvf lattice.tar.gz - go get github.com/rakyll/statik - - go install -v github.com/rakyll/statik@latest - - ls -al /go/bin - - /go/bin/statik -src=lattice + - go install github.com/rakyll/statik@latest + - statik -h + - statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 67835f746d3988d192f6a2883c6ca863ebe5b3f5 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 12:17:09 -0600 Subject: [PATCH 13/26] please work --- .gitlab/.gitlab-ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index d9e79826d..3263764ac 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -143,10 +143,9 @@ build for darwin amd64: script: - rm -r lattice - tar -xvf lattice.tar.gz - - go get github.com/rakyll/statik - - go install github.com/rakyll/statik@latest - - statik -h - - statik -src=lattice + - sudo go get github.com/rakyll/statik + - /go/bin/statik -h + - /go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 49ce895c4d963c4be8a4a1aebfe6f0f601aeea40 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 12:19:27 -0600 Subject: [PATCH 14/26] change path --- .gitlab/.gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 3263764ac..3a135677e 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -143,9 +143,8 @@ build for darwin amd64: script: - rm -r lattice - tar -xvf lattice.tar.gz - - sudo go get github.com/rakyll/statik - - /go/bin/statik -h - - /go/bin/statik -src=lattice + - go get github.com/rakyll/statik + - ~/go/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 948928c06efaab303e8501e8c3ee466b67b49ae0 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 12:37:18 -0600 Subject: [PATCH 15/26] set gopath explicitly --- .gitlab/.gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 3a135677e..767ecfda1 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -140,7 +140,9 @@ build for darwin amd64: variables: GOOS: "darwin" GOARCH: "amd64" + GOPATH: "~/go/" script: + - mkdir -p ~/go/bin - rm -r lattice - tar -xvf lattice.tar.gz - go get github.com/rakyll/statik From 220515bbd4ad605f00d30b54129dabf81da9fb8c Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 12:53:33 -0600 Subject: [PATCH 16/26] "update path" --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 767ecfda1..bee4e8cda 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -140,13 +140,13 @@ build for darwin amd64: variables: GOOS: "darwin" GOARCH: "amd64" - GOPATH: "~/go/" + GOPATH: "/go/" script: - mkdir -p ~/go/bin - rm -r lattice - tar -xvf lattice.tar.gz - go get github.com/rakyll/statik - - ~/go/bin/statik -src=lattice + - $GOPATH/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 91271795acf4619e582df4f8b6b0a065458a71a7 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 13:07:42 -0600 Subject: [PATCH 17/26] f --- .gitlab/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index bee4e8cda..a4499efd5 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -140,7 +140,7 @@ build for darwin amd64: variables: GOOS: "darwin" GOARCH: "amd64" - GOPATH: "/go/" + GOPATH: "/go" script: - mkdir -p ~/go/bin - rm -r lattice From 0d8ecfbcb5b13f38e3a7e5a821147f2628def368 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 13:22:12 -0600 Subject: [PATCH 18/26] be more explicit? --- .gitlab/.gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index a4499efd5..2a8154489 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -142,10 +142,10 @@ build for darwin amd64: GOARCH: "amd64" GOPATH: "/go" script: - - mkdir -p ~/go/bin + - mkdir -p $GOPATH - rm -r lattice - tar -xvf lattice.tar.gz - - go get github.com/rakyll/statik + - go get -v -u github.com/rakyll/statik - $GOPATH/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: From 9ff56e032ec764b6ae1fbffbdfbd70cf825e25ea Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 13:37:57 -0600 Subject: [PATCH 19/26] pls --- .gitlab/.gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 2a8154489..bc91bd649 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -146,6 +146,7 @@ build for darwin amd64: - rm -r lattice - tar -xvf lattice.tar.gz - go get -v -u github.com/rakyll/statik + - go install github.com/rakyll/statik@latest - $GOPATH/bin/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: From de0e8cc0f9d9e88967fa57e3d63407ae20b93ba6 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 13:52:39 -0600 Subject: [PATCH 20/26] maybe go bin is in a different spot? --- .gitlab/.gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index bc91bd649..20fae519e 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -140,14 +140,14 @@ build for darwin amd64: variables: GOOS: "darwin" GOARCH: "amd64" - GOPATH: "/go" + GOBIN: "/go/bin" script: - - mkdir -p $GOPATH + - mkdir -p $GOBIN - rm -r lattice - tar -xvf lattice.tar.gz - go get -v -u github.com/rakyll/statik - - go install github.com/rakyll/statik@latest - - $GOPATH/bin/statik -src=lattice + - go install -v github.com/rakyll/statik@latest + - $GOBIN/statik -src=lattice - make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 4995888f00e245bf4094c5e0aea7e301f9cbe206 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 14:11:56 -0600 Subject: [PATCH 21/26] the problem was i was installing it for a different architecture smh --- .gitlab/.gitlab-ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 20fae519e..83bb9be05 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -137,18 +137,12 @@ build for darwin amd64: stage: build image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 extends: .go-cache - variables: - GOOS: "darwin" - GOARCH: "amd64" - GOBIN: "/go/bin" script: - - mkdir -p $GOBIN - rm -r lattice - tar -xvf lattice.tar.gz - go get -v -u github.com/rakyll/statik - - go install -v github.com/rakyll/statik@latest - $GOBIN/statik -src=lattice - - make build FLAGS="-o featurebase_darwin_amd64" + - GOOS="darwin" GOARCH="amd64" make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: - featurebase_darwin_amd64 From fd1a2d2e782adb9aef4d09f922d20a66f32e9516 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 14:26:27 -0600 Subject: [PATCH 22/26] smh --- .gitlab/.gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 83bb9be05..d91592dd9 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -141,7 +141,7 @@ build for darwin amd64: - rm -r lattice - tar -xvf lattice.tar.gz - go get -v -u github.com/rakyll/statik - - $GOBIN/statik -src=lattice + - /go/bin/statik -src=lattice - GOOS="darwin" GOARCH="amd64" make build FLAGS="-o featurebase_darwin_amd64" artifacts: paths: From 541df0fe3733b7e571c952b26b7a464e46f45477 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 14:40:05 -0600 Subject: [PATCH 23/26] is it because of the go cache? --- .gitlab/.gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index d91592dd9..29cb2b05e 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -136,7 +136,6 @@ build for linux arm64: build for darwin amd64: stage: build image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 - extends: .go-cache script: - rm -r lattice - tar -xvf lattice.tar.gz From d1345ca265cfb788479b83183f8c36aa75dd73a7 Mon Sep 17 00:00:00 2001 From: reesporte Date: Sun, 14 Nov 2021 15:00:28 -0600 Subject: [PATCH 24/26] build all with golang:1.16.10 --- .gitlab/.gitlab-ci.yml | 50 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 29cb2b05e..5d07a1dc9 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -77,6 +77,18 @@ run go tests: paths: - coverage.out +run go tests future: + stage: test + image: golang:1.17.3 + extends: .go-cache + script: + - echo "Running featurebase unit tests..." + - ./cover-everything.sh + artifacts: + paths: + - coverage.out + + run go tests with output: stage: test image: golang:1.16.10 @@ -102,40 +114,32 @@ upload to sonarcloud: build for linux amd64: stage: build image: golang:1.16.10 - extends: .go-cache - variables: - GOOS: "linux" - GOARCH: "amd64" script: - - go get github.com/rakyll/statik - - go install github.com/rakyll/statik@latest + - rm -r lattice - tar -xvf lattice.tar.gz + - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - - make build FLAGS="-o featurebase_linux_amd64" + - GOOS="linux" GOARCH="amd64" make build FLAGS="-o featurebase_linux_amd64" artifacts: paths: - featurebase_linux_amd64 build for linux arm64: stage: build - image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 - extends: .go-cache - variables: - GOOS: "linux" - GOARCH: "arm64" + image: golang:1.16.10 script: - - go get github.com/rakyll/statik - - go install github.com/rakyll/statik@latest + - rm -r lattice - tar -xvf lattice.tar.gz + - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - - make build FLAGS="-o featurebase_linux_arm64" + - GOOS="linux" GOARCH="arm64" make build FLAGS="-o featurebase_linux_arm64" artifacts: paths: - featurebase_linux_arm64 build for darwin amd64: stage: build - image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 + image: golang:1.16.10 script: - rm -r lattice - tar -xvf lattice.tar.gz @@ -148,24 +152,20 @@ build for darwin amd64: build for darwin arm64: stage: build - image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 - extends: .go-cache - variables: - GOOS: "darwin" - GOARCH: "arm64" + image: golang:1.16.10 script: - - go get github.com/rakyll/statik - - go install github.com/rakyll/statik@latest + - rm -r lattice - tar -xvf lattice.tar.gz + - go get -v -u github.com/rakyll/statik - /go/bin/statik -src=lattice - - make build FLAGS="-o featurebase_darwin_arm64" + - GOOS="darwin" GOARCH="arm64" make build FLAGS="-o featurebase_darwin_arm64" artifacts: paths: - featurebase_darwin_arm64 package for linux amd64: stage: build - image: registry.gitlab.com/molecula/featurebase/builder:0.0.3 + image: golang:1.16.10 variables: GOOS: "linux" GOARCH: "amd64" From 0a4e9fe8cf8273d17244b28b273ddcad4c18aafb Mon Sep 17 00:00:00 2001 From: reesporte Date: Mon, 15 Nov 2021 10:16:43 -0600 Subject: [PATCH 25/26] move lattice build dir to right location --- .gitlab/.gitlab-ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index 5d07a1dc9..cb2d6546c 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -42,12 +42,17 @@ build lattice: variables: CI: "false" script: - - echo "Building lattice..." + - # install and build lattice - cd lattice - yarn install - yarn build + - # move the build dir out and rename + - mv build ../ - cd ../ - - tar -czvf lattice.tar.gz lattice/build + - rm -r lattice + - mv build lattice + - # zip it up + - tar -czvf lattice.tar.gz lattice artifacts: paths: - lattice.tar.gz From ed5525c83675c19905eb5f9be8ebfe3080a4e7dc Mon Sep 17 00:00:00 2001 From: reesporte Date: Mon, 15 Nov 2021 10:19:51 -0600 Subject: [PATCH 26/26] remove long lines i guess --- .gitlab/.gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab/.gitlab-ci.yml b/.gitlab/.gitlab-ci.yml index cb2d6546c..ccd710889 100644 --- a/.gitlab/.gitlab-ci.yml +++ b/.gitlab/.gitlab-ci.yml @@ -42,16 +42,13 @@ build lattice: variables: CI: "false" script: - - # install and build lattice - cd lattice - yarn install - yarn build - - # move the build dir out and rename - mv build ../ - cd ../ - rm -r lattice - mv build lattice - - # zip it up - tar -czvf lattice.tar.gz lattice artifacts: paths: