From 9bed72e178af1193f05552fbeac688cad5e8a373 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 12 Dec 2024 13:42:07 -0500 Subject: [PATCH 1/2] Update builds to go 1.22.7 inline with go.mod Signed-off-by: Jonathan Marcantonio --- .github/workflows/build-test.yml | 2 +- .github/workflows/golangci-lint.yml | 2 +- Dockerfile | 4 ++-- api/Dockerfile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index c308e63b..87a51637 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version-file: 'go.mod' cache: true - name: Install dependencies run: go get ./... diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 7e809e0e..be431f63 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: '1.21.x' + go-version-file: 'go.mod' - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6 diff --git a/Dockerfile b/Dockerfile index 927aabab..dcc259df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,8 +5,8 @@ USER root RUN microdnf install -y tar gzip make which # install platform specific go version -RUN curl -O -J https://dl.google.com/go/go1.22.0.linux-${TARGETARCH}.tar.gz -RUN tar -C /usr/local -xzf go1.22.0.linux-${TARGETARCH}.tar.gz +RUN curl -O -J https://dl.google.com/go/go1.22.7.linux-${TARGETARCH}.tar.gz +RUN tar -C /usr/local -xzf go1.22.7.linux-${TARGETARCH}.tar.gz RUN ln -s /usr/local/go/bin/go /usr/local/bin/go WORKDIR /workspace diff --git a/api/Dockerfile b/api/Dockerfile index 029c384a..f2aca996 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -5,8 +5,8 @@ USER root RUN microdnf install -y tar gzip unzip # install platform specific go version -RUN curl -O -J https://dl.google.com/go/go1.22.0.linux-${TARGETARCH}.tar.gz -RUN tar -C /usr/local -xzf go1.22.0.linux-${TARGETARCH}.tar.gz +RUN curl -O -J https://dl.google.com/go/go1.22.7.linux-${TARGETARCH}.tar.gz +RUN tar -C /usr/local -xzf go1.22.7.linux-${TARGETARCH}.tar.gz RUN ln -s /usr/local/go/bin/go /usr/local/bin/go # Install protoc plugins From 8f9712d5c74d0135d71463806c6317a19fac5e17 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Thu, 12 Dec 2024 13:55:26 -0500 Subject: [PATCH 2/2] Checkout repo first Signed-off-by: Jonathan Marcantonio --- .github/workflows/golangci-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index be431f63..67f95401 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -11,10 +11,10 @@ jobs: name: lint runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version-file: 'go.mod' - - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: