Update go version in Makefile too and temporary disable travis ci

arangodb-helper · Aug 7, 2023 · c7a0e23 · c7a0e23
1 parent 9e4663a
commit c7a0e23
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ services:
 language: go
 
 go:
-  - "1.20.x"
+  - "1.20.7"
 
 env:
   - VERBOSE=1 MULTIARCH=0 GOIMAGE=gcr.io/gcr-for-testing/golang:1.20.7 ALPINE_IMAGE=gcr.io/gcr-for-testing/alpine:3.17 ARANGODB=gcr.io/gcr-for-testing/arangodb/arangodb:3.9.2 STARTER_MODES="single,cluster,activefailover"
@@ -18,8 +18,4 @@ script:
   - |
     set -e
     make check
-    if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ ! -z "$ALWAYS" ]; then
-      make run-tests
-    fi
-    make binaries
     make vulncheck
diff --git a/Makefile b/Makefile
@@ -17,7 +17,7 @@ ALPINE_IMAGE ?= alpine:3.16
 DOCKERCLI ?= $(shell which docker)
 GOBUILDLINKTARGET := ../../../..
 
-DOCKERMACLI := $(DOCKERCLI) buildx build -f "$(ROOTDIR)/Dockerfile.ma" --build-arg "IMAGE=$(ALPINE_IMAGE)" \
+DOCKERMACLI := $(DOCKERCLI) buildx build --load -f "$(ROOTDIR)/Dockerfile.ma" --build-arg "IMAGE=$(ALPINE_IMAGE)" \
                			--platform linux/amd64,linux/arm64
 
 BUILDDIR ?= $(ROOTDIR)
@@ -35,7 +35,7 @@ REPODIR := $(ORGDIR)/$(REPONAME)
 REPOPATH := $(ORGPATH)/$(REPONAME)
 
 GOPATH := $(GOBUILDDIR)
-GOVERSION := 1.20.3
+GOVERSION := 1.20.7
 GOIMAGE ?= golang:$(GOVERSION)-alpine3.17
 
 GOOS ?= linux