test build

grafana · Jul 13, 2021 · 76b79a4 · 76b79a4
1 parent 75305d7
commit 76b79a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -30,7 +30,6 @@ steps:
   - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
   - rm go1.16.5.linux-amd64.tar.gz
   - export PATH=$PATH:/usr/local/go/bin
-  - export DRONE=true
   - make BUILD_IN_CONTAINER=false RELEASE_TAG=v0.0.0 dist
 ---
 kind: pipeline
@@ -51,7 +50,6 @@ steps:
   - tar -C /usr/local -xzf go1.16.5.linux-amd64.tar.gz
   - rm go1.16.5.linux-amd64.tar.gz
   - export PATH=$PATH:/usr/local/go/bin
-  - export DRONE=true
   - make BUILD_IN_CONTAINER=false test
 ---
 kind: pipeline
@@ -92,7 +90,6 @@ steps:
   - GO111MODULE=on go get -u github.com/mitchellh/gox github.com/tcnksm/ghr
   - export PATH="$(go env GOPATH)/bin:$PATH"
   - RELEASE_TAG=$DRONE_TAG
-  - export DRONE=true
   - make -j4 BUILD_IN_CONTAINER=false RELEASE_BUILD=true RELEASE_TAG=$RELEASE_TAG publish
 
 volumes:
@@ -130,8 +127,8 @@ steps:
   - chmod a+x ~/.docker/cli-plugins/docker-buildx
   - docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   - docker buildx create --name multiarch --driver docker-container --use
-  - make CROSS_BUILD=true RELEASE_BUILD=true DRONE=true agent-image
-  - make CROSS_BUILD=true RELEASE_BUILD=true DRONE=true agentctl-image
+  - make CROSS_BUILD=true RELEASE_BUILD=true agent-image
+  - make CROSS_BUILD=true RELEASE_BUILD=true agentctl-image
   - docker buildx rm multiarch
 
 volumes:
@@ -140,6 +137,6 @@ volumes:
     path: /var/run/docker.sock
 ---
 kind: signature
-hmac: 4224ec002ff93f34e5d432a3b93ca884081ca707b9f435b6097509d7e7e42d77
+hmac: 7ecbeab4e9191c2ec769bd5481d6b243ce6e72520bb9cc45a63afa2a20df5e46
 
 ...
diff --git a/Makefile b/Makefile
@@ -83,7 +83,7 @@ endif
 seego = docker run --rm -t -v "$(CURDIR):$(CURDIR)" -w "$(CURDIR)" -e "CGO_ENABLED=$$CGO_ENABLED" -e "GOOS=$$GOOS" -e "GOARCH=$$GOARCH" -e "GOARM=$$GOARM" rfratto/seego
 $(info    DRONE is $(DRONE))
 ifeq ($(DRONE),true)
-	seego = bash ./go_wrapper.sh go
+	seego = bash ./.drone/go_wrapper.sh 
 endif
 $(info    seego is $(seego))
 # Set the CGO, CC, CCX flags based on targetplatform, if non given assume 'native' to the device