diff options
| author | Kir Kolyshkin <kolyshkin@gmail.com> | 2022-04-13 17:24:32 -0700 |
|---|---|---|
| committer | Kir Kolyshkin <kolyshkin@gmail.com> | 2022-05-17 13:41:17 -0700 |
| commit | 2b54bf3e64f1969dea1fac79365d0b84aa6714a9 (patch) | |
| tree | fe15bfb5544f917c3ca3a65258633b6a1585214d | |
| parent | 11d3cf26977538b1ee20ea331e0f14e995d7f550 (diff) | |
| download | podman-2b54bf3e64f1969dea1fac79365d0b84aa6714a9.tar.gz podman-2b54bf3e64f1969dea1fac79365d0b84aa6714a9.tar.bz2 podman-2b54bf3e64f1969dea1fac79365d0b84aa6714a9.zip | |
Move GOPROXY from Makefile to cirrus.yml
GOPROXY's default value is "https://proxy.golang.org,direct"
since go 1.13, so it is redundant to set it explicitly.
For some reason though, GOPROXY in Cirrus CI is set to direct,
which makes things such as go mod tidy very slow. So, set the
proper (default) value for in in .cirrus.yml. Do the same for GOSUMDB.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
| -rw-r--r-- | .cirrus.yml | 3 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index eed12b02f..ee0131279 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -7,6 +7,9 @@ env: #### # Name of the ultimate destination branch for this CI run, PR or post-merge. DEST_BRANCH: "main" + # Sane (default) value for GOPROXY and GOSUMDB. + GOPROXY: "https://proxy.golang.org,direct" + GOSUMDB: "sum.golang.org" # Overrides default location (/tmp/cirrus) for repo clone GOPATH: &gopath "/var/tmp/go" GOCACHE: "${GOPATH}/cache" @@ -20,8 +20,6 @@ ### Variables & Definitions ### -export GOPROXY=https://proxy.golang.org - GO ?= go GO_LDFLAGS:= $(shell if $(GO) version|grep -q gccgo ; then echo "-gccgoflags"; else echo "-ldflags"; fi) GOCMD = CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) $(GO) |