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

update go version thats needed by the new libp2p

Browse Source
This commit is contained in:
jennijuju 2022-04-22 17:04:55 +02:00
parent efad692353
commit bd9e8c7663
9 changed files with 34 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
.circleci/config.yml
View File

@ -1,12 +1,11 @@
version: 2.1 version: 2.1
orbs: orbs:
go: gotest/tools@0.0.13
aws-cli: circleci/aws-cli@1.3.2 aws-cli: circleci/aws-cli@1.3.2
executors: executors:
golang: golang:
docker: docker:
- image: circleci/golang:1.16.4 - image: cimg/go:1.17.9
resource_class: 2xlarge resource_class: 2xlarge
ubuntu: ubuntu:
docker: docker:
@ -25,8 +24,9 @@ executors:
commands: commands:
install-deps: install-deps:
steps: steps:
- go/install-ssh - run: |
- go/install: {package: git} sudo apt update
sudo apt install python-is-python3
prepare: prepare:
parameters: parameters:
linux: linux:
@ -110,8 +110,12 @@ jobs:
steps: steps:
- install-deps - install-deps
- prepare - prepare
- go/mod-tidy-check - run: go mod tidy -v
- run:
name: Check git diff
command: |
git --no-pager diff go.mod go.sum
git --no-pager diff --quiet go.mod go.sum
build-all: build-all:
executor: golang executor: golang
steps: steps:
@ -188,9 +192,6 @@ jobs:
command: make deps lotus command: make deps lotus
no_output_timeout: 30m no_output_timeout: 30m
- download-params - download-params
- go/install-gotestsum:
gobin: $HOME/.local/bin
version: 0.5.2
- run: - run:
name: go test name: go test
environment: environment:
@ -215,8 +216,6 @@ jobs:
- when: - when:
condition: << parameters.codecov-upload >> condition: << parameters.codecov-upload >>
steps: steps:
- go/install: {package: bash}
- go/install: {package: curl}
- run: - run:
shell: /bin/bash -eo pipefail shell: /bin/bash -eo pipefail
command: | command: |
@ -255,9 +254,6 @@ jobs:
cd extern/test-vectors cd extern/test-vectors
git fetch git fetch
git checkout origin/<< parameters.vectors-branch >> git checkout origin/<< parameters.vectors-branch >>
- go/install-gotestsum:
gobin: $HOME/.local/bin
version: 0.5.2
- run: - run:
name: install statediff globally name: install statediff globally
command: | command: |
@ -370,8 +366,8 @@ jobs:
- run: - run:
name: Install go name: Install go
command: | command: |
curl -O https://dl.google.com/go/go1.16.4.darwin-amd64.pkg && \ curl -O https://dl.google.com/go/go1.17.9.darwin-amd64.pkg && \
sudo installer -pkg go1.16.4.darwin-amd64.pkg -target / sudo installer -pkg go1.17.9.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
@ -512,9 +508,6 @@ jobs:
executor: executor:
type: executor type: executor
default: golang default: golang
golangci-lint-version:
type: string
default: 1.27.0
concurrency: concurrency:
type: string type: string
default: '2' default: '2'
@ -533,13 +526,10 @@ jobs:
- run: - run:
command: make deps command: make deps
no_output_timeout: 30m no_output_timeout: 30m
- go/install-golangci-lint:
gobin: $HOME/.local/bin
version: << parameters.golangci-lint-version >>
- run: - run:
name: Lint name: Lint
command: | command: |
$HOME/.local/bin/golangci-lint run -v --timeout 2m \ golangci-lint run -v --timeout 2m \
--concurrency << parameters.concurrency >> << parameters.args >> --concurrency << parameters.concurrency >> << parameters.args >>
lint-all: lint-all:
<<: *lint <<: *lint

36
.circleci/template.yml
View File

@ -1,12 +1,11 @@
version: 2.1 version: 2.1
orbs: orbs:
go: gotest/tools@0.0.13
aws-cli: circleci/aws-cli@1.3.2 aws-cli: circleci/aws-cli@1.3.2
executors: executors:
golang: golang:
docker: docker:
- image: circleci/golang:1.16.4 - image: cimg/go:1.17.9
resource_class: 2xlarge resource_class: 2xlarge
ubuntu: ubuntu:
docker: docker:
@ -25,8 +24,9 @@ executors:
commands: commands:
install-deps: install-deps:
steps: steps:
- go/install-ssh - run: |
- go/install: {package: git} sudo apt update
sudo apt install python-is-python3
prepare: prepare:
parameters: parameters:
linux: linux:
@ -110,8 +110,12 @@ jobs:
steps: steps:
- install-deps - install-deps
- prepare - prepare
- go/mod-tidy-check - run: go mod tidy -v
- run:
name: Check git diff
command: |
git --no-pager diff go.mod go.sum
git --no-pager diff --quiet go.mod go.sum
build-all: build-all:
executor: golang executor: golang
steps: steps:
@ -188,9 +192,6 @@ jobs:
command: make deps lotus command: make deps lotus
no_output_timeout: 30m no_output_timeout: 30m
- download-params - download-params
- go/install-gotestsum:
gobin: $HOME/.local/bin
version: 0.5.2
- run: - run:
name: go test name: go test
environment: environment:
@ -215,8 +216,6 @@ jobs:
- when: - when:
condition: << parameters.codecov-upload >> condition: << parameters.codecov-upload >>
steps: steps:
- go/install: {package: bash}
- go/install: {package: curl}
- run: - run:
shell: /bin/bash -eo pipefail shell: /bin/bash -eo pipefail
command: | command: |
@ -255,9 +254,6 @@ jobs:
cd extern/test-vectors cd extern/test-vectors
git fetch git fetch
git checkout origin/<< parameters.vectors-branch >> git checkout origin/<< parameters.vectors-branch >>
- go/install-gotestsum:
gobin: $HOME/.local/bin
version: 0.5.2
- run: - run:
name: install statediff globally name: install statediff globally
command: | command: |
@ -370,8 +366,8 @@ jobs:
- run: - run:
name: Install go name: Install go
command: | command: |
curl -O https://dl.google.com/go/go1.16.4.darwin-amd64.pkg && \ curl -O https://dl.google.com/go/go1.17.9.darwin-amd64.pkg && \
sudo installer -pkg go1.16.4.darwin-amd64.pkg -target / sudo installer -pkg go1.17.9.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
@ -512,9 +508,6 @@ jobs:
executor: executor:
type: executor type: executor
default: golang default: golang
golangci-lint-version:
type: string
default: 1.27.0
concurrency: concurrency:
type: string type: string
default: '2' default: '2'
@ -533,13 +526,10 @@ jobs:
- run: - run:
command: make deps command: make deps
no_output_timeout: 30m no_output_timeout: 30m
- go/install-golangci-lint:
gobin: $HOME/.local/bin
version: << parameters.golangci-lint-version >>
- run: - run:
name: Lint name: Lint
command: | command: |
$HOME/.local/bin/golangci-lint run -v --timeout 2m \ golangci-lint run -v --timeout 2m \
--concurrency << parameters.concurrency >> << parameters.args >> --concurrency << parameters.concurrency >> << parameters.args >>
lint-all: lint-all:
<<: *lint <<: *lint

2
.github/workflows/codeql-analysis.yml vendored
View File

@ -37,7 +37,7 @@ jobs:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: '1.16.4' go-version: '1.17.9'
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL

2
Dockerfile.lotus
View File

@ -1,4 +1,4 @@
FROM golang:1.16.4 AS builder-deps FROM golang:1.17.9-buster AS builder-deps
MAINTAINER Lotus Development Team MAINTAINER Lotus Development Team
RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev RUN apt-get update && apt-get install -y ca-certificates build-essential clang ocl-icd-opencl-dev ocl-icd-libopencl1 jq libhwloc-dev

2
Makefile
View File

@ -10,7 +10,7 @@ GOCC?=go
GOVERSION:=$(shell $(GOCC) version | tr ' ' '\n' | grep go1 | sed 's/^go//' | awk -F. '{printf "%d%03d%03d", $$1, $$2, $$3}') GOVERSION:=$(shell $(GOCC) version | tr ' ' '\n' | grep go1 | sed 's/^go//' | awk -F. '{printf "%d%03d%03d", $$1, $$2, $$3}')
ifeq ($(shell expr $(GOVERSION) \< 1016000), 1) ifeq ($(shell expr $(GOVERSION) \< 1016000), 1)
$(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell expr $(GOVERSION) % 1000000 / 1000).$(shell expr $(GOVERSION) % 1000)) $(warning Your Golang version is go$(shell expr $(GOVERSION) / 1000000).$(shell expr $(GOVERSION) % 1000000 / 1000).$(shell expr $(GOVERSION) % 1000))
$(error Update Golang to version to at least 1.16.0) $(error Update Golang to version to at least 1.17.9)
endif endif
# git modules that need to be loaded # git modules that need to be loaded

4
README.md
View File

@ -71,10 +71,10 @@ For other distributions you can find the required dependencies [here.](https://d
#### Go #### Go
To build Lotus, you need a working installation of [Go 1.16.4 or higher](https://golang.org/dl/): To build Lotus, you need a working installation of [Go 1.17.9 or higher](https://golang.org/dl/):
```bash ```bash
wget -c https://golang.org/dl/go1.16.4.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local wget -c https://golang.org/dl/go1.17.9.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local
``` ```
**TIP:** **TIP:**

2
testplans/docker-images/Dockerfile.oni-buildbase
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.3 ARG GO_VERSION=1.17.9
FROM golang:${GO_VERSION}-buster FROM golang:${GO_VERSION}-buster

2
testplans/docker-images/Dockerfile.oni-runtime
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.3 ARG GO_VERSION=1.17.9
FROM golang:${GO_VERSION}-buster as downloader FROM golang:${GO_VERSION}-buster as downloader

2
testplans/docker-images/Dockerfile.oni-runtime-debug
View File

@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.3 ARG GO_VERSION=1.17.9
FROM golang:${GO_VERSION}-buster as downloader FROM golang:${GO_VERSION}-buster as downloader