Skip to content

Commit ccdd44c

Browse files
authored
Upgrade to go 1.22 (eksctl-io#8125)
* Upgrade to go 1.22 * fix: Add missing test deps * chore: Move tool installation to its own make target * chore: Update `goformation` go version to `1.22` and run `make build`
1 parent 947e96f commit ccdd44c

24 files changed

+194
-529
lines changed

.dockerignore

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
*
2-
!.git
3-
!.goreleaser*
4-
!.golangci*
5-
!.mockery.yaml
6-
!build/scripts
7-
!cmd
8-
!examples
9-
!go.*
10-
!integration
11-
!LICENSE
12-
!Makefile*
13-
!pkg
14-
!tools.go
1+
.editorconfig
2+
.dockerignore
3+
.github
4+
.gitignore
5+
*.md
6+
*.toml
7+
docs
8+
eksctl
9+
examples
10+
logo
11+
userdocs
12+
CNAME
13+
DCO
14+
LICENSE

.github/actions/setup-build/action.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
- name: Setup Go
99
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 #v5.0.0
1010
with:
11-
go-version: 1.21.x
11+
go-version: 1.22.x
1212
cache: false
1313
- name: Cache go-build and mod
1414
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 #v4.0.0
@@ -19,7 +19,3 @@ runs:
1919
key: go-${{ hashFiles('go.sum') }}
2020
restore-keys: |
2121
go-
22-
- name: Setup deps
23-
shell: bash
24-
run: |
25-
make install-build-deps

.github/workflows/build-all-distros-nightly.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/workflows/cache-dependencies.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/ecr-publish-build.yaml

Lines changed: 0 additions & 38 deletions
This file was deleted.

.github/workflows/ecr-publish.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,4 @@ jobs:
4646
context: .
4747
push: true
4848
tags: ${{ steps.meta.outputs.tags }}
49-
labels: ${{ steps.meta.outputs.labels }}
49+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/test-and-build.yaml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
- name: Lint
3333
run: |
3434
PATH=$PATH:$(go env GOPATH)/bin make lint
35+
3536
image:
3637
name: Build and check image
3738
runs-on: ubuntu-latest
@@ -40,8 +41,10 @@ jobs:
4041
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2
4142
with:
4243
fetch-depth: 0
43-
- name: Setup build environment
44-
uses: ./.github/actions/setup-build
45-
- name: build
46-
run: |
47-
PATH=$PATH:$(go env GOPATH)/bin make -f Makefile.docker check-build-image-manifest-up-to-date
44+
- name: Build image
45+
id: push
46+
uses: docker/build-push-action@b32b51a8eda65d6793cd0494a773d4f6bcef32dc #v6.11.0
47+
with:
48+
context: .
49+
file: ./Dockerfile
50+
push: false

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# options for analysis running
22
run:
3-
go: "1.21"
3+
go: "1.22"
44

55
# default concurrency is a available CPU number
66
concurrency: 4

.requirements

Lines changed: 0 additions & 15 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ then head to the [main docs](https://eksctl.io/) for more information.
284284

285285
This project is written in Go. To be able to contribute you will need:
286286

287-
1. A working Go installation of Go >= 1.12. You can check the
287+
1. A working Go installation of Go >= 1.22. You can check the
288288
[official installation guide](https://golang.org/doc/install).
289289

290290
2. Make sure that `$(go env GOPATH)/bin` is in your shell's `PATH`. You can do so by
@@ -344,19 +344,6 @@ To run the tests simply run the following after `install-build-deps`:
344344
make test
345345
```
346346

347-
If you prefer to use Docker, the same way it is used in CI, you can use the
348-
following command:
349-
350-
```bash
351-
make -f Makefile.docker test
352-
```
353-
354-
> NOTE: It is not the most convenient way of working on the project, as
355-
> binaries are built inside the container and cannot be tested manually,
356-
> also majority of end-users consume binaries and not Docker images.
357-
> It is recommended to use `make build` etc, unless there is an issue in CI
358-
> that need troubleshooting.
359-
360347
#### Running the integration tests
361348

362349
> NOTE: Some parts of the integration tests are not configurable and therefore

0 commit comments

Comments
 (0)