Skip to content

Commit

Permalink
Merge pull request #10279 from vegaprotocol/feature/go1.21
Browse files Browse the repository at this point in the history
update required go version to 1.21
  • Loading branch information
jeremyletang authored Dec 21, 2023
2 parents 9f76a74 + a0249b8 commit 802f381
Show file tree
Hide file tree
Showing 10 changed files with 280 additions and 233 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,24 @@ jobs:
language: ['go']

steps:
- uses: actions/setup-go@v4
with:
go-version: '>=1.21.0'
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
10 changes: 5 additions & 5 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: '1.20'
- uses: actions/checkout@v3
go-version: '1.21.5'
- uses: actions/checkout@v4
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v3.7.0
with:
version: v1.53.2
version: v1.55.2
args: --config .golangci.toml
6 changes: 3 additions & 3 deletions .github/workflows/release-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.20'
go-version: '1.21'
id: go

- name: Check out code
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
uses: actions/setup-go@v2

with:
go-version: '1.20'
go-version: '1.21'
id: go

- name: Check out code
Expand Down Expand Up @@ -264,7 +264,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.20'
go-version: '1.21'
id: go

- name: Check out code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '1.20'
go-version: '1.21'
-
name: Get dependencies
run: cd vega; bash script/gettools.sh
Expand Down
8 changes: 8 additions & 0 deletions .golangci.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,14 @@ disable = [
"dupword",
"depguard",
"revive",

## new with 1.55.2, need to evaluate
"testifylint",
"inamedparam",
"perfsprint",
"typecheck",
"protogetter",

## Disabled on-pupose.
"exhaustruct", # We often make incomplete structs.
"lll", # We don't have a line length.
Expand Down
2 changes: 1 addition & 1 deletion docker/data-node.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8-alpine3.18 AS builder
FROM golang:1.21.5-alpine3.18 AS builder
RUN apk add --no-cache git
ENV CGO_ENABLED=0
WORKDIR /src
Expand Down
2 changes: 1 addition & 1 deletion docker/vega.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8-alpine3.18 AS builder
FROM golang:1.21.5-alpine3.18 AS builder
RUN apk add --no-cache git
ENV CGO_ENABLED=0
WORKDIR /src
Expand Down
2 changes: 1 addition & 1 deletion docker/vegawallet.dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20.8-alpine3.18 AS builder
FROM golang:1.21.5-alpine3.18 AS builder
RUN apk add --no-cache git
WORKDIR /src
ADD . .
Expand Down
Loading

0 comments on commit 802f381

Please sign in to comment.