diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index c9137de3d6..333002837b 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: # renovate: datasource=golang-version depName=go - go-version: 1.21.6 + go-version: 1.22.0 - name: Run static checks uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 diff --git a/.github/workflows/kind.yaml b/.github/workflows/kind.yaml index ba9f5edeb7..d40d2634dd 100644 --- a/.github/workflows/kind.yaml +++ b/.github/workflows/kind.yaml @@ -41,7 +41,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: # renovate: datasource=golang-version depName=go - go-version: 1.21.6 + go-version: 1.22.0 - name: Set up Go for root run: | @@ -223,7 +223,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: # renovate: datasource=golang-version depName=go - go-version: 1.21.6 + go-version: 1.22.0 - name: Set up Go for root run: | diff --git a/.github/workflows/multicluster.yaml b/.github/workflows/multicluster.yaml index 9e0ae0c989..138fdf6ede 100644 --- a/.github/workflows/multicluster.yaml +++ b/.github/workflows/multicluster.yaml @@ -84,7 +84,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: # renovate: datasource=golang-version depName=go - go-version: 1.21.6 + go-version: 1.22.0 - name: Set up job variables id: vars diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 4fc1dae5ee..9db71228e5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -20,7 +20,7 @@ jobs: uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: # renovate: datasource=golang-version depName=go - go-version: 1.21.6 + go-version: 1.22.0 - name: Generate the artifacts run: make release diff --git a/Dockerfile b/Dockerfile index 6bcc10e423..4c487b41ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # Copyright Authors of Cilium # SPDX-License-Identifier: Apache-2.0 -FROM docker.io/library/golang:1.21.6-alpine3.19@sha256:a6a7f1fcf12f5efa9e04b1e75020931a616cd707f14f62ab5262bfbe109aa84a as builder +FROM docker.io/library/golang:1.22.0-alpine3.19@sha256:8e96e6cff6a388c2f70f5f662b64120941fcd7d4b89d62fec87520323a316bd9 as builder WORKDIR /go/src/github.com/cilium/cilium-cli RUN apk add --no-cache git make ca-certificates COPY . . diff --git a/go.mod b/go.mod index f0e481b164..0e8805f398 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cilium/cilium-cli -go 1.21.6 +go 1.22.0 // Replace directives from github.com/cilium/cilium. Keep in sync when updating Cilium! replace ( diff --git a/vendor/github.com/rubenv/sql-migrate/test-migrations/1_initial.sql b/vendor/github.com/rubenv/sql-migrate/test-migrations/1_initial.sql deleted file mode 100644 index cd896fbd7b..0000000000 --- a/vendor/github.com/rubenv/sql-migrate/test-migrations/1_initial.sql +++ /dev/null @@ -1,8 +0,0 @@ --- +migrate Up --- SQL in section 'Up' is executed when this migration is applied -CREATE TABLE people (id int); - - --- +migrate Down --- SQL section 'Down' is executed when this migration is rolled back -DROP TABLE people; diff --git a/vendor/github.com/rubenv/sql-migrate/test-migrations/2_record.sql b/vendor/github.com/rubenv/sql-migrate/test-migrations/2_record.sql deleted file mode 100644 index c76d7691bf..0000000000 --- a/vendor/github.com/rubenv/sql-migrate/test-migrations/2_record.sql +++ /dev/null @@ -1,5 +0,0 @@ --- +migrate Up -INSERT INTO people (id) VALUES (1); - --- +migrate Down -DELETE FROM people WHERE id=1;