cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #4896 from filecoin-project/upg/go

Browse Source 
Update go to 1.15.5
This commit is contained in:
Jakub Sztandera 2020-11-17 21:35:13 +01:00 committed by GitHub
commit e7549dbf2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -5,7 +5,7 @@ orbs:
executors: executors:
golang: golang:
docker: docker:
- image: circleci/golang:1.14.6 - image: circleci/golang:1.15.5
resource_class: 2xlarge resource_class: 2xlarge
ubuntu: ubuntu:
docker: docker:
@ -294,8 +294,8 @@ jobs:
- run: - run:
name: Install go name: Install go
command: | command: |
curl -O https://dl.google.com/go/go1.14.2.darwin-amd64.pkg && \ curl -O https://dl.google.com/go/go1.15.5.darwin-amd64.pkg && \
sudo installer -pkg go1.14.2.darwin-amd64.pkg -target / sudo installer -pkg go1.15.5.darwin-amd64.pkg -target /
- run: - run:
name: Install pkg-config name: Install pkg-config
command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config command: HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config

8
Makefile
View File

@ -5,10 +5,10 @@ all: build
unexport GOFLAGS unexport GOFLAGS
GOVERSION:=$(shell go version | cut -d' ' -f 3 | cut -d. -f 2) GOVERSION:=$(shell go version | cut -d' ' -f 3 | awk -F. '{printf "%d%03d", $$2, $$3}')
ifeq ($(shell expr $(GOVERSION) \< 14), 1) ifeq ($(shell expr $(GOVERSION) \< 15005), 1)
$(warning Your Golang version is go 1.$(GOVERSION)) $(warning Your Golang version is go 1.$(shell expr $(GOVERSION) / 1000).$(shell expr $(GOVERSION) % 1000))
$(error Update Golang to version $(shell grep '^go' go.mod)) $(error Update Golang to version to at least 1.15.5)
endif endif
# git modules that need to be loaded # git modules that need to be loaded