From b6907d3975c2ba00f98463aba4cc98e004e5982a Mon Sep 17 00:00:00 2001 From: Caleb Brown Date: Tue, 10 Sep 2024 16:58:51 +1000 Subject: [PATCH] Bump Go to v1.23.1 Signed-off-by: Caleb Brown --- .github/workflows/build-images.yml | 2 +- .github/workflows/build.yml | 3 +-- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/test.yml | 4 ++-- README.md | 2 +- cmd/analyze/Dockerfile | 2 +- cmd/scheduler/Dockerfile | 2 +- function/loader/go.mod | 2 +- go.mod | 2 +- sandboxes/staticanalysis/Dockerfile | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml index 4774f3b2..1af7a27a 100644 --- a/.github/workflows/build-images.yml +++ b/.github/workflows/build-images.yml @@ -19,7 +19,7 @@ jobs: - name: setup-go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21.0' + go-version-file: 'go.mod' - name: Enable docker experimental run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 909dff5e..c118cde0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,13 +7,12 @@ permissions: read-all jobs: Build: - name: runs-on: ubuntu-latest steps: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21.0' + go-version-file: 'go.mod' - name: Install libpcap-dev run: sudo apt-get install -y libpcap-dev - run: go build -o scheduler ./cmd/scheduler diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 0522631b..e607acc1 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: - name: setup-go uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21.0' + go-version-file: 'go.mod' # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bf1e3a67..0a142939 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21.0' + go-version-file: 'go.mod' - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3 with: node-version: 18 @@ -28,6 +28,6 @@ jobs: - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2 with: - go-version: '1.21.0' + go-version-file: 'go.mod' - name: golangci-lint uses: golangci/golangci-lint-action@3cfe3a4abbb849e10058ce4af15d205b6da42804 # v4.0.0 diff --git a/README.md b/README.md index 6cbd8699..18777a75 100644 --- a/README.md +++ b/README.md @@ -152,7 +152,7 @@ See `sample_packages/README.md` for how to use a sample package that simulates m ### Required Dependencies -- Go v1.21 +- Go v1.23.1 - Docker # Contributing diff --git a/cmd/analyze/Dockerfile b/cmd/analyze/Dockerfile index 37dd225d..d18bf12c 100644 --- a/cmd/analyze/Dockerfile +++ b/cmd/analyze/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.0@sha256:12359f96c43077803959dab88ce60c87cd2543f3b907bf54a34a5104270f404f as build +FROM golang:1.23.1@sha256:4a3c2bcd243d3dbb7b15237eecb0792db3614900037998c2cd6a579c46888c1e as build RUN apt-get update && apt-get install -y libpcap-dev WORKDIR /src diff --git a/cmd/scheduler/Dockerfile b/cmd/scheduler/Dockerfile index 56f0115d..bfc4a99d 100644 --- a/cmd/scheduler/Dockerfile +++ b/cmd/scheduler/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.0@sha256:12359f96c43077803959dab88ce60c87cd2543f3b907bf54a34a5104270f404f as build +FROM golang:1.23.1@sha256:4a3c2bcd243d3dbb7b15237eecb0792db3614900037998c2cd6a579c46888c1e as build WORKDIR /src # First cache the dependencies to avoid downloading again on code change diff --git a/function/loader/go.mod b/function/loader/go.mod index e46cda3d..fc976edf 100644 --- a/function/loader/go.mod +++ b/function/loader/go.mod @@ -1,6 +1,6 @@ module github.com/ossf/package-analysis/loader -go 1.21 +go 1.23.1 require cloud.google.com/go/bigquery v1.62.0 diff --git a/go.mod b/go.mod index 59dae585..08856fca 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/ossf/package-analysis -go 1.21 +go 1.23.1 require ( cloud.google.com/go/pubsub v1.37.0 diff --git a/sandboxes/staticanalysis/Dockerfile b/sandboxes/staticanalysis/Dockerfile index 26399f3c..27ad076a 100644 --- a/sandboxes/staticanalysis/Dockerfile +++ b/sandboxes/staticanalysis/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.0@sha256:12359f96c43077803959dab88ce60c87cd2543f3b907bf54a34a5104270f404f as build +FROM golang:1.23.1@sha256:4a3c2bcd243d3dbb7b15237eecb0792db3614900037998c2cd6a579c46888c1e as build # Note: Dockerfile uses paths relative to the top-level project directory, # so it should be built from that directory, i.e: