Skip to content

go1.24 #1963

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

go1.24 #1963

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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
image: quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
steps:
- name: Checkout
uses: actions/checkout@v4
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.8
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9
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.8
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9

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.8
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9

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.8
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9

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.8
FROM quay.io/stackrox-io/apollo-ci:scanner-test-0.4.9

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.8
scanner-build-0.4.9
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/stackrox/scanner

go 1.23.3
go 1.24

toolchain go1.23.6
toolchain go1.24.3
Copy link
Collaborator Author

@RTann RTann Jul 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

I learned we MUST have a toolchain version set to some version available downstream (Konflux kept failing at the prefetch stage until I made this change).

I originally removed the toolchain line and just set go 1.24 (to match the stackrox repo).

1.24 doesn't exist there, but 1.24.3 does. We could just update go 1.24 to go 1.24.3 and remove the toolchain; however, I prefer not requiring anyone who may use this repo as a library be forced to use some specific minor version of Go unless we absolutely require it. I opted to keep go 1.24 and just update the the toolchain to toolchain go1.24.3

Just a heads up we'll probably have to do this for the stackrox repo @janisz @msugakov

Copy link
Contributor

Choose a reason for hiding this comment

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

Simply, openshift-golang-builder has no ability to download any toolchains because that feature is disabled. The only one it can use is what's provided. If the image comes with 1.24.3, the highest toolchain we can have (when building with openshift-golang-builder) is 1.24.3.


require (
cloud.google.com/go/storage v1.55.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.23@sha256:0a070e4a8f2698b6aba3630a49eb995ff1b0a182d0c5fa264888acf9d535f384 AS builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.24@sha256:07ae0767d904b0bd698e2fc8c25243f53c45e39a4257be816cc97a01a03e0336 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 pkg/analyzer/java/java.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var nameRegexp = regexp.MustCompile(`([[:graph:]]+)-([[:digit:]][\-.[:alnum:]]*(
// checkName returns the extracted package name from the above regexp.
func checkName(name string) string {
m := nameRegexp.FindStringSubmatch(name)
if m == nil || len(m) < 2 {
if len(m) < 2 {
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was called out after the linter update

return name
}
return m[1]
Expand Down
Loading