From ab798581251a769173b5a0a92cd1207b80744c10 Mon Sep 17 00:00:00 2001 From: Jonathan Marcantonio Date: Fri, 13 Dec 2024 09:30:00 -0500 Subject: [PATCH] RHCLOUD-35152 - Update builds to go 1.22.7 inline with go.mod (#300) * Update builds to go 1.22.7 inline with go.mod Signed-off-by: Jonathan Marcantonio * Checkout repo first Signed-off-by: Jonathan Marcantonio --------- Signed-off-by: Jonathan Marcantonio --- .github/workflows/build-test.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- Dockerfile | 4 ++-- api/Dockerfile | 4 ++-- 4 files changed, 7 insertions(+), 7 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..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: '1.21.x' - - uses: actions/checkout@v4 + go-version-file: 'go.mod' - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: 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