Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update golang to 1.18 and k8s to 0.24.2 #629

Merged
merged 4 commits into from Dec 5, 2022
Merged

update golang to 1.18 and k8s to 0.24.2 #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db7b885
update k8s, golang and lint versions
ranakan19 Dec 2, 2022
c2cbd64
lint and cache version update
ranakan19 Dec 2, 2022
e40ddae
add replace for api and common
ranakan19 Dec 2, 2022
026c27a
go mod update/replace
xcoulon Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/ci-build.yml
View file
Open in desktop
Expand Up @@ -15,18 +15,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Checkout code
uses: actions/checkout@v2

- name: Lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: v1.43.0
skip-go-installation: true # we already installed Go with `actions/setup-go@v2` above
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there any reason for removing the skip-go-installation flag here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seem like since v3 they are not installing go anymore by default v3 PR

version: v1.45.0
skip-pkg-cache: true
skip-build-cache: true
args: --config=./.golangci.yml --verbose
Expand All @@ -36,9 +35,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Checkout code
uses: actions/checkout@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-operators-for-e2e-tests.yml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ on:

env:
GOPATH: /tmp/go
GO_VERSION: 1.17.x
GO_VERSION: 1.18.x

jobs:
binary:
Expand Down Expand Up @@ -47,12 +47,12 @@ jobs:
fetch-depth: 0

- name: Install Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: ${{ env.GO_VERSION }}

- name: Cache dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles ('**/go.sum') }}
Expand Down
32 changes: 16 additions & 16 deletions go.mod
View file
Open in desktop
@@ -1,14 +1,14 @@
module github.com/codeready-toolchain/toolchain-e2e

require (
github.com/codeready-toolchain/api v0.0.0-20221121081259-4f672e808b89
github.com/codeready-toolchain/toolchain-common v0.0.0-20221124073251-2d6d8cbd5eb7
github.com/codeready-toolchain/api v0.0.0-20221205081558-245f157cb403
github.com/codeready-toolchain/toolchain-common v0.0.0-20221205082814-2dbd788a5e87
github.com/davecgh/go-spew v1.1.1
github.com/fatih/color v1.12.0
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.2.0
github.com/gofrs/uuid v3.3.0+incompatible
github.com/google/go-cmp v0.5.6
github.com/google/go-cmp v0.5.7
github.com/gorilla/websocket v1.4.2
github.com/gosuri/uiprogress v0.0.1
github.com/gosuri/uitable v0.0.4
Expand All @@ -25,12 +25,12 @@ require (
github.com/spf13/cobra v1.4.0
github.com/spf13/viper v1.8.1
github.com/stretchr/testify v1.8.0
k8s.io/api v0.24.0
k8s.io/apimachinery v0.24.0
k8s.io/client-go v0.24.0
k8s.io/kubectl v0.24.0
k8s.io/metrics v0.24.0
sigs.k8s.io/controller-runtime v0.12.0
k8s.io/api v0.24.2
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
k8s.io/kubectl v0.24.2
k8s.io/metrics v0.24.2
sigs.k8s.io/controller-runtime v0.12.2
)

require (
Expand Down Expand Up @@ -67,7 +67,7 @@ require (
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/lestrrat-go/jwx v0.9.0 // indirect
github.com/lestrrat-go/jwx v0.9.2 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
Expand Down Expand Up @@ -95,9 +95,9 @@ require (
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.19.1 // indirect
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8 // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
Expand All @@ -109,14 +109,14 @@ require (
gopkg.in/ini.v1 v1.62.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.24.0 // indirect
k8s.io/component-base v0.24.0 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/component-base v0.24.2 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

go 1.17
go 1.18