Skip to content

Commit c7a0e23

Browse files
Update go version in Makefile too and temporary disable travis ci
1 parent 9e4663a commit c7a0e23

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
language: go
77

88
go:
9-
- "1.20.x"
9+
- "1.20.7"
1010

1111
env:
1212
- 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:
1818
- |
1919
set -e
2020
make check
21-
if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ ! -z "$ALWAYS" ]; then
22-
make run-tests
23-
fi
24-
make binaries
2521
make vulncheck

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ALPINE_IMAGE ?= alpine:3.16
1717
DOCKERCLI ?= $(shell which docker)
1818
GOBUILDLINKTARGET := ../../../..
1919

20-
DOCKERMACLI := $(DOCKERCLI) buildx build -f "$(ROOTDIR)/Dockerfile.ma" --build-arg "IMAGE=$(ALPINE_IMAGE)" \
20+
DOCKERMACLI := $(DOCKERCLI) buildx build --load -f "$(ROOTDIR)/Dockerfile.ma" --build-arg "IMAGE=$(ALPINE_IMAGE)" \
2121
--platform linux/amd64,linux/arm64
2222

2323
BUILDDIR ?= $(ROOTDIR)
@@ -35,7 +35,7 @@ REPODIR := $(ORGDIR)/$(REPONAME)
3535
REPOPATH := $(ORGPATH)/$(REPONAME)
3636

3737
GOPATH := $(GOBUILDDIR)
38-
GOVERSION := 1.20.3
38+
GOVERSION := 1.20.7
3939
GOIMAGE ?= golang:$(GOVERSION)-alpine3.17
4040

4141
GOOS ?= linux

0 commit comments

Comments
 (0)