Skip to content

Commit

Permalink
Bump go to 1.22 and yip to latest (#405)
Browse files Browse the repository at this point in the history
  • Loading branch information
Itxaka authored Jul 11, 2024
1 parent 774d059 commit 5a23b64
Show file tree
Hide file tree
Showing 9 changed files with 66 additions and 35 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/osv-scanner-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ on:
permissions:
# Require writing security events to upload SARIF file to security tab
security-events: write
# Only need to read contents
# Only need to read contents and actions
contents: read
actions: read

jobs:
scan-pr:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '^1.19.10'
go-version-file: 'go.mod'
- name: Build WebUI dependencies
run: cd ./internal/webui/public && npm install
- name: Run GoReleaser
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ jobs:
unit-tests:
strategy:
matrix:
# Match this version to the maintained FIPS version in packages at https://github.com/kairos-io/packages/blob/main/packages/toolchain-go/collection.yaml#L63
go-version: ["1.19.10-bookworm", "1.20-bookworm", "1.21-bookworm"]
go-version: [ "1.22-bookworm" ]
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/webui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ jobs:
webui:
strategy:
matrix:
# Match this version to the maintained FIPS version in packages at https://github.com/kairos-io/packages/blob/main/packages/toolchain-go/collection.yaml#L63
go-version: [ "1.19.10-bookworm", "1.20-bookworm", "1.21-bookworm" ]
go-version: [ "1.22-bookworm" ]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ env:
- GOSUMDB=sum.golang.org
before:
hooks:
- go mod tidy -compat=1.19
- go mod tidy
4 changes: 2 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM alpine
# renovate: datasource=docker depName=golang
ARG --global GOLINT_VERSION=1.52.2
# renovate: datasource=docker depName=golang
ARG --global GO_VERSION=1.20-bookworm
ARG --global GO_VERSION=1.22-bookworm
# renovate: datasource=docker depName=cypress/base
ARG --global CYPRESS_VERSION=18.16.0

Expand All @@ -13,7 +13,7 @@ go-deps:
RUN apt-get update && apt-get install -y rsync gcc bash git
WORKDIR /build
COPY . .
RUN go mod tidy --compat=1.19
RUN go mod tidy
RUN go mod download
RUN go mod verify

Expand Down
14 changes: 5 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
module github.com/kairos-io/kairos-agent/v2

go 1.19
go 1.22

// This versions require go1.20
replace (
github.com/onsi/ginkgo/v2 v2.17.1 => github.com/onsi/ginkgo/v2 v2.12.1
github.com/onsi/gomega v1.33.0 => github.com/onsi/gomega v1.28.0
)
toolchain go1.22.4

require (
github.com/Masterminds/semver/v3 v3.2.1
Expand All @@ -25,7 +21,7 @@ require (
github.com/mudler/go-nodepair v0.0.0-20221223092639-ba399a66fdfb
github.com/mudler/go-pluggable v0.0.0-20230126220627-7710299a0ae5
github.com/mudler/go-processmanager v0.0.0-20230818213616-f204007f963c
github.com/mudler/yip v1.9.0
github.com/mudler/yip v1.9.2
github.com/nxadm/tail v1.4.11
github.com/onsi/ginkgo/v2 v2.17.1
github.com/onsi/gomega v1.33.0
Expand Down Expand Up @@ -149,7 +145,7 @@ require (
github.com/moby/moby v24.0.9+incompatible // indirect
github.com/moby/sys/mountinfo v0.6.2 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/mudler/entities v0.0.0-20240625130751-3d7f84082f3a // indirect
github.com/mudler/entities v0.8.0 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
Expand Down Expand Up @@ -193,7 +189,7 @@ require (
github.com/swaggest/refl v1.3.0 // indirect
github.com/tklauser/go-sysconf v0.3.11 // indirect
github.com/tklauser/numcpus v0.6.0 // indirect
github.com/tredoe/osutil/v2 v2.0.0-rc.16 // indirect
github.com/tredoe/osutil v1.5.0 // indirect
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
Expand Down
68 changes: 52 additions & 16 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"timezone": "Europe/Brussels",
"rebaseWhen": "behind-base-branch",
"constraints": {
"go": "1.19"
"go": "1.22"
},
"packageRules": [
{
Expand Down

0 comments on commit 5a23b64

Please sign in to comment.