Skip to content

Commit

Permalink
RHCLOUD-35152 - Update builds to go 1.22.7 inline with go.mod (#300)
Browse files Browse the repository at this point in the history
* Update builds to go 1.22.7 inline with go.mod

Signed-off-by: Jonathan Marcantonio <[email protected]>

* Checkout repo first

Signed-off-by: Jonathan Marcantonio <[email protected]>

---------

Signed-off-by: Jonathan Marcantonio <[email protected]>
  • Loading branch information
lennysgarage authored Dec 13, 2024
1 parent a49a07b commit ab79858
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ab79858

Please sign in to comment.