diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ceb37140a2..62bbb47c80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: go-version: - - 1.16 + - 1.17 platform: - ubuntu-latest runs-on: ${{ matrix.platform }} @@ -45,7 +45,7 @@ jobs: strategy: matrix: go-version: - - 1.16 + - 1.17 platform: - ubuntu-latest runs-on: ${{ matrix.platform }} diff --git a/Makefile b/Makefile index e288bacc82..fe8a3b66ea 100644 --- a/Makefile +++ b/Makefile @@ -3,6 +3,8 @@ all: clear build VERSION=$(shell git rev-parse --verify HEAD --short=7) BRANCH=$(shell git rev-parse --abbrev-ref HEAD) PACKAGES ?= $(shell go list ./... | grep -v /vendor/) +SUDO = $(shell which sudo) +GO_EXECUTABLE_PATH ?= $(shell which go) #GOPROXY ?= https://goproxy.io ifdef GOPROXY @@ -39,7 +41,7 @@ check: vet .PHONY: test test: - go test -race -v -mod=mod -cover ${PACKAGES} + $(SUDO) NYDUS_BUILDER=${NYDUS_BUILDER} NYDUS_NYDUSD=${NYDUS_NYDUSD} ${GO_EXECUTABLE_PATH} test -race -v -mod=mod -cover ${PACKAGES} .PHONY: cover cover: