Skip to content

Commit 7942d5e

Browse files
committed
Bump go version, add trivy
1 parent 8ffd1a8 commit 7942d5e

File tree

10 files changed

+26
-11
lines changed

10 files changed

+26
-11
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Set up Go
2323
uses: actions/setup-go@v3
2424
with:
25-
go-version: '1.22.9'
25+
go-version: '1.24.8'
2626

2727
- name: Install dependencies
2828
run: |
@@ -48,7 +48,7 @@ jobs:
4848
- name: Set up Go
4949
uses: actions/setup-go@v3
5050
with:
51-
go-version: '1.22.9'
51+
go-version: '1.24.8'
5252

5353
- name: Install dependencies
5454
run: |

.github/workflows/docker.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,19 @@ jobs:
6060
# arm64 is more expensive to build, so only build it on the default branch or for tags
6161
platforms: ${{ (env.IS_DEFAULT_BRANCH == 'true' || env.IS_TAG == 'true') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
6262
cache-from: type=local,src=/tmp/.buildx-cache
63-
cache-to: type=local,dest=/tmp/.buildx-cache
63+
cache-to: type=local,dest=/tmp/.buildx-cache
64+
load: ${{ env.IS_DEFAULT_BRANCH != 'true' && env.IS_TAG != 'true' }}
65+
66+
- name: Run Trivy vulnerability scanner
67+
uses: aquasecurity/trivy-action@master
68+
with:
69+
image-ref: ghcr.io/${{ github.repository_owner }}/cortex-axon-agent:${{ steps.meta.outputs.version }}
70+
format: 'sarif'
71+
output: 'trivy-results.sarif'
72+
severity: 'CRITICAL,HIGH'
73+
74+
- name: Upload Trivy scan results to GitHub Security tab
75+
uses: github/codeql-action/upload-sarif@v3
76+
if: always()
77+
with:
78+
sarif_file: 'trivy-results.sarif'

agent/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexapps/axon
22

3-
go 1.22.9
3+
go 1.24.8
44

55
require (
66
github.com/google/uuid v1.6.0

agent/test/relay/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ services:
6464
stop_grace_period: 1s # SIGKILL after 1s
6565

6666
cortex-fake:
67-
image: golang:1.22-alpine
67+
image: golang:1.24-alpine
6868
volumes:
6969
- .:/src
7070
environment:

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ARG SNYK_BROKER_VERSION=4.203.4
1010
RUN wget -q -O - https://deb.nodesource.com/setup_${NODE_VERSION}.x | bash - && apt install -y nodejs
1111
RUN npm install -g snyk-broker@${SNYK_BROKER_VERSION}
1212

13-
ENV GOLANG_VERSION=1.22.9
13+
ENV GOLANG_VERSION=1.24.8
1414
# Install Go, this script will work for ARM or AMD64
1515
RUN wget -q -O /tmp/goinstall.sh https://raw.githubusercontent.com/canha/golang-tools-install-script/master/goinstall.sh && chmod +x /tmp/goinstall.sh && /tmp/goinstall.sh --version ${GOLANG_VERSION}
1616

examples/go/axon-ev-sync/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexapps/axon_apps/axon-ev-sync
22

3-
go 1.22.9
3+
go 1.24.8
44

55
require (
66
github.com/cortexapps/axon-go v0.0.0

scaffold/go/axon_client/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexapps/axon-go
22

3-
go 1.22.9
3+
go 1.24.8
44

55
require (
66
github.com/google/uuid v1.6.0

scaffold/go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexapps/axon_apps/{{.ProjectName}}
22

3-
go 1.22.9
3+
go 1.24.8
44

55
require (
66
github.com/google/uuid v1.6.0

sdks/go/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cortexapps/axon-go
22

3-
go 1.22.9
3+
go 1.24.8
44

55
require (
66
github.com/google/uuid v1.6.0

sdks/python/poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)