diff --git a/.github/workflows/aws-integration.yaml b/.github/workflows/aws-integration.yaml index f09f1e3048..cbcedaa460 100644 --- a/.github/workflows/aws-integration.yaml +++ b/.github/workflows/aws-integration.yaml @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - name: Check out code into the Go module directory uses: actions/checkout@v4 - name: Cache go module diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ace1145024..57b0883612 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,7 +33,7 @@ jobs: python-version: '3.12' - uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - uses: pre-commit/action@v3.0.1 - uses: pre-commit/action@v3.0.1 name: Verify generated files are up-to-date @@ -81,7 +81,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - name: Check out code into the Go module directory uses: actions/checkout@v4 - name: Cache go module @@ -135,7 +135,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - name: Build and push fleet-manager-tools image to quay.io if: github.event_name == 'push' env: diff --git a/.github/workflows/emailsender-central-compatibility.yaml b/.github/workflows/emailsender-central-compatibility.yaml index f5ed3e151e..e8d30b3914 100644 --- a/.github/workflows/emailsender-central-compatibility.yaml +++ b/.github/workflows/emailsender-central-compatibility.yaml @@ -35,7 +35,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: "1.23" + go-version: "1.24" - name: Cache go module uses: actions/cache@v4 with: diff --git a/.golangci.yml b/.golangci.yml index 82162f6a6d..3bc4c16a68 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -91,7 +91,7 @@ linters-settings: require-explanation: false # don't require an explanation for nolint directives require-specific: true # require nolint directives to be specific about which linter is being skipped staticcheck: - go: "1.23" + go: "1.24" checks: [ all,-ST1000,-ST1001,-ST1003,-ST1005,-SA1019,-SA4001,-ST1016 ] wrapcheck: {} # ignoreSigRegexps: uncomment to add ignore rules diff --git a/go.mod b/go.mod index 430c23a3ee..4c4e0e136b 100644 --- a/go.mod +++ b/go.mod @@ -1,12 +1,14 @@ module github.com/stackrox/acs-fleet-manager -go 1.23.0 +go 1.24.6 + +toolchain go1.24.7 require ( github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/antihax/optional v1.0.0 github.com/argoproj-labs/argocd-operator v0.14.0 - github.com/argoproj/argo-cd/v2 v2.14.13 + github.com/argoproj/argo-cd/v2 v2.14.16 github.com/aws/aws-sdk-go-v2 v1.36.5 github.com/aws/aws-sdk-go-v2/config v1.29.17 github.com/aws/aws-sdk-go-v2/credentials v1.17.70 diff --git a/go.sum b/go.sum index 0b88ba74f3..61c05795b4 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,8 @@ github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwc github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/argoproj-labs/argocd-operator v0.14.0 h1:ksHsdV5hC8u275PWU746EXB/c09g7UzdJPdkIqDQwjU= github.com/argoproj-labs/argocd-operator v0.14.0/go.mod h1:UHe70eXnnCEfzp7EWRofMU+BFnPgZiT5OSqpuInEARA= -github.com/argoproj/argo-cd/v2 v2.14.13 h1:oSLPHV9Gon6mEqVkyBOuLJ7T16ShZv6xSjkCiquzEDM= -github.com/argoproj/argo-cd/v2 v2.14.13/go.mod h1:P72XxcRigWQpQsuAgaXyHPFYkSPE4sdACA5g/s3Si1I= +github.com/argoproj/argo-cd/v2 v2.14.16 h1:S7ZE9XqyyQCAqaJO37+CyO1zdytkTr/Uepo4TlgPUvk= +github.com/argoproj/argo-cd/v2 v2.14.16/go.mod h1:CF9GX0CjKiszpAnvYNCLV5tLSVqgfOgn/tcOt2VHTQo= github.com/argoproj/gitops-engine v0.7.1-0.20250521000818-c08b0a72c1f1 h1:Ze4U6kV49vSzlUBhH10HkO52bYKAIXS4tHr/MlNDfdU= github.com/argoproj/gitops-engine v0.7.1-0.20250521000818-c08b0a72c1f1/go.mod h1:WsnykM8idYRUnneeT31cM/Fq/ZsjkefCbjiD8ioCJkU= github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 h1:qsHwwOJ21K2Ao0xPju1sNuqphyMnMYkyB3ZLoLtxWpo= diff --git a/tools/go.mod b/tools/go.mod index e2469c86ab..87a4cfe71d 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,8 @@ module github.com/stackrox/acs-fleet-manager/tools -go 1.23.0 +go 1.24.6 + +toolchain go1.24.7 require ( github.com/matryer/moq v0.5.2