Skip to content

Commit

Permalink
Merge pull request #7075 from cPu1/go1.20
Browse files Browse the repository at this point in the history
Update to Go 1.20
  • Loading branch information
cPu1 authored Sep 18, 2023
2 parents 83e92f4 + a1fe6cf commit 7b4fb8c
Show file tree
Hide file tree
Showing 31 changed files with 300 additions and 289 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-all-distros-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Setup deps
run: |
make install-build-deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ecr-publish-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x

- name: Setup deps
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/link-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Install doc dependencies
run: make install-site-deps
- name: Build docs for link check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Cache go-build and mod
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 #v3.3.1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release-type.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Setup deps
run: |
make install-build-deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-candidate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
rc:
name: Trigger release candidate build
runs-on: ubuntu-latest
container: public.ecr.aws/eksctl/eksctl-build:61f65e7d548635be5f25d4fe6a0029b3872878c0
container: public.ecr.aws/eksctl/eksctl-build:c48ad877cb885407ce4864ab09874e0b31867f40
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
rc:
name: Trigger release build
runs-on: ubuntu-latest
container: public.ecr.aws/eksctl/eksctl-build:61f65e7d548635be5f25d4fe6a0029b3872878c0
container: public.ecr.aws/eksctl/eksctl-build:c48ad877cb885407ce4864ab09874e0b31867f40
steps:
- name: Checkout
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac #v4.0.0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-and-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Setup deps
run: |
make install-build-deps
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Setup deps
run: |
make install-build-deps
Expand All @@ -80,7 +80,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe #v4.1.0
with:
go-version: 1.18.x
go-version: 1.20.x
- name: Setup deps
run: |
make install-build-deps
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
update_aws_node:
name: Update aws-node and open PR
runs-on: ubuntu-latest
container: public.ecr.aws/eksctl/eksctl-build:61f65e7d548635be5f25d4fe6a0029b3872878c0
container: public.ecr.aws/eksctl/eksctl-build:c48ad877cb885407ce4864ab09874e0b31867f40
env:
GOPRIVATE: ""
steps:
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# options for analysis running
run:
go: '1.18'
go: '1.20'

# default concurrency is a available CPU number
concurrency: 4
Expand Down
4 changes: 2 additions & 2 deletions .requirements
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github.com/maxbrunsfeld/counterfeiter/v6
github.com/cloudflare/cfssl/cmd/cfssl@v1.5.0
github.com/cloudflare/cfssl/cmd/cfssljson@v1.5.0
github.com/cloudflare/cfssl/cmd/cfssl@v1.6.4
github.com/cloudflare/cfssl/cmd/cfssljson@v1.6.4
github.com/golangci/golangci-lint/cmd/golangci-lint
github.com/goreleaser/goreleaser
github.com/onsi/ginkgo/v2/[email protected]
Expand Down
1 change: 0 additions & 1 deletion ATTRIBUTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ License version 2.0, we include the full text of the package's License below.
* `github.com/vburenin/ifacemaker`
* `github.com/vektra/mockery/v2`
* `github.com/weaveworks/goformation/v4`
* `github.com/weaveworks/launcher`
* `github.com/weaveworks/schemer`
* `github.com/xgfone/netaddr`
* `golang.org/x/crypto`
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:61f65e7d548635be5f25d4fe6a0029b3872878c0
ARG BUILD_IMAGE=public.ecr.aws/eksctl/eksctl-build:c48ad877cb885407ce4864ab09874e0b31867f40
FROM $BUILD_IMAGE as build

WORKDIR /src
Expand Down
2 changes: 1 addition & 1 deletion build/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Make sure to run the following commands after changes to this file are made:
# `make -f Makefile.docker update-build-image-tag && make -f Makefile.docker push-build-image`

FROM golang:1.18.8-alpine3.16@sha256:6b494c932ee8c209631e27521ddbe364da56e7f1275998fbb182447d20103e46 AS base
FROM golang:1.20.8-alpine3.18@sha256:90246ec31bcf460ff3dbe8a4a63e8997bc36781a2eba9e0419e9b53e0bd36a0d AS base

# Add kubectl and aws-iam-authenticator to the PATH
ENV PATH="${PATH}:/out/usr/bin:/out/usr/local/bin"
Expand Down
6 changes: 3 additions & 3 deletions build/docker/build_image_manifest
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"github.com/maxbrunsfeld/counterfeiter/v6 v6.6.2"
"github.com/cloudflare/cfssl v1.6.4"
"github.com/cloudflare/cfssl v1.6.4"
"github.com/golangci/golangci-lint v1.50.1"
"github.com/golangci/golangci-lint v1.54.2"
"github.com/goreleaser/goreleaser v1.11.5"
"github.com/onsi/ginkgo/v2 v2.12.0"
"github.com/vektra/mockery/v2 v2.33.1"
Expand All @@ -14,6 +14,6 @@
"k8s.io/code-generator v0.25.11"
"sigs.k8s.io/mdtoc v1.1.0"
"github.com/vburenin/ifacemaker v1.2.1"
100644 blob 73037af40e41f5241efaa821aec1e4bf930e9979 build/docker/Dockerfile
100644 blob d94ab874534caa366b6220b6e11e4c4fd355fe28 .requirements
100644 blob 80fe0de3dabc122dacbf9fd528653fab7c25af4b build/docker/Dockerfile
100644 blob 57d81a0f47058dcb0e20aad51364b50e89331aaa .requirements
100755 blob c1129ff1ff85ac2c53f908a577675ea59a9325a7 build/scripts/install-build-deps.sh
2 changes: 1 addition & 1 deletion build/docker/image_tag
Original file line number Diff line number Diff line change
@@ -1 +1 @@
61f65e7d548635be5f25d4fe6a0029b3872878c0
c48ad877cb885407ce4864ab09874e0b31867f40
Loading

0 comments on commit 7b4fb8c

Please sign in to comment.