Skip to content

ROX-32281: Bump Go to 1.25 #2520

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

Closed
guzalv wants to merge 1 commit into from
Closed

ROX-32281: Bump Go to 1.25 #2520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
pre-build-updater:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
fail-fast: false
matrix: ${{ fromJson(needs.define-scanner-job-matrix.outputs.matrix).build_and_push }}
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
style-check:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -120,7 +120,7 @@ jobs:
unit-tests:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand All @@ -139,7 +139,7 @@ jobs:
db-integration-tests:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
needs:
- pre-build-updater
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
needs:
- generate-genesis-dump
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
fail-fast: false
matrix: ${{ fromJson(needs.define-scanner-job-matrix.outputs.matrix).build_and_push }}
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -314,7 +314,7 @@ jobs:
needs:
- generate-db-dump
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -365,7 +365,7 @@ jobs:
fail-fast: false
matrix: ${{ fromJson(needs.define-scanner-job-matrix.outputs.matrix).build_and_push }}
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
- build-images
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
env:
QUAY_RHACS_ENG_RW_USERNAME: ${{ secrets.QUAY_RHACS_ENG_RW_USERNAME }}
QUAY_RHACS_ENG_RW_PASSWORD: ${{ secrets.QUAY_RHACS_ENG_RW_PASSWORD }}
Expand Down Expand Up @@ -484,7 +484,7 @@ jobs:
needs:
- generate-genesis-dump
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -602,7 +602,7 @@ jobs:
needs:
- generate-db-dump
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -630,7 +630,7 @@ jobs:
needs:
- generate-db-dump
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down Expand Up @@ -664,7 +664,7 @@ jobs:
needs:
- generate-db-dump
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sanity-check-vuln-updates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
SLACK_WEBHOOK_ONCALL: ${{ secrets.SLACK_ONCALL_SCANNER_WEBHOOK }}
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
steps:
- name: Checkout
uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
run:
timeout: 16m
modules-download-mode: readonly
go: "1.23"
go: "1.25"

output:
formats:
Expand Down
2 changes: 1 addition & 1 deletion .openshift-ci/Dockerfile.build_root
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
# - `make update` and commit the results
# - run `/test pj-rehearse-max` on the openshift/release PR to validate the change

FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1
2 changes: 1 addition & 1 deletion .openshift-ci/build/Dockerfile.build-bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1

COPY . /go/src/github.com/stackrox/scanner
WORKDIR /go/src/github.com/stackrox/scanner
Expand Down
2 changes: 1 addition & 1 deletion .openshift-ci/build/Dockerfile.build-db-bundle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1

COPY . /go/src/github.com/stackrox/scanner
WORKDIR /go/src/github.com/stackrox/scanner
Expand Down
2 changes: 1 addition & 1 deletion .openshift-ci/build/Dockerfile.generate-db-dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1

COPY . /go/src/github.com/stackrox/scanner
WORKDIR /go/src/github.com/stackrox/scanner
Expand Down
2 changes: 1 addition & 1 deletion .openshift-ci/build/Dockerfile.generate-genesis-dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.5.1

COPY . /go/src/github.com/stackrox/scanner
WORKDIR /go/src/github.com/stackrox/scanner
Expand Down
2 changes: 1 addition & 1 deletion BUILD_IMAGE_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
scanner-build-0.4.9
scanner-build-0.5.1
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/stackrox/scanner

go 1.24.0

toolchain go1.24.4
go 1.25

require (
cloud.google.com/go/storage v1.58.0
Expand Down
2 changes: 1 addition & 1 deletion image/scanner/rhel/konflux.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Compiling scanner binaries and staging repo2cpe and genesis manifests
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.24@sha256:c52f52b73cc121327416b3fe8d64d682eb48b2c86298a4d645d7169251700cd5 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.25@sha256:527782f4a0270f786192281f68d0374f4a21b3ab759643eee4bfcafb6f539468 AS builder

ARG SCANNER_TAG
RUN if [[ "$SCANNER_TAG" == "" ]]; then >&2 echo "error: required SCANNER_TAG arg is unset"; exit 6; fi
Expand Down
2 changes: 1 addition & 1 deletion tools/linters/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/stackrox/scanner/tools/linters

go 1.24
go 1.25

require (
github.com/golangci/golangci-lint v1.64.8
Expand Down
2 changes: 1 addition & 1 deletion tools/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/stackrox/scanner/tools/test

go 1.24
go 1.25

require github.com/jstemmer/go-junit-report/v2 v2.1.0