Skip to content

Commit

Permalink
Update project to use go 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
Bennett Sala committed Mar 18, 2024
1 parent 15ab723 commit 72aeac8
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/actions/integration-test/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ inputs:
runs:
using: "composite"
steps:
- name: Install Go 1.20
- name: Install Go 1.22
uses: actions/setup-go@v3
with:
go-version: '1.20.*'
go-version: '1.22.*'
id: go

- name: Setup Test Tools
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
name: build
runs-on: ubuntu-22.04
steps:
- name: Set up Go 1.20
- name: Set up Go 1.22
uses: actions/setup-go@v3
with:
go-version: '1.20.*'
go-version: '1.22.*'
id: go
- name: checkout code
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
name: unit-test
runs-on: ubuntu-22.04
steps:
- name: setup go 1.20
- name: setup go 1.22
uses: actions/setup-go@v3
with:
go-version: '1.20.*'
go-version: '1.22.*'
id: go
- name: setup kubebuilder
run: |
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:experimental

# Build the controller binary
FROM --platform=${BUILDPLATFORM} golang:1.20 as builder
FROM --platform=${BUILDPLATFORM} golang:1.22 as builder

WORKDIR /workspace

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aws/aws-app-mesh-controller-for-k8s

go 1.20
go 1.22

require (
github.com/aws/aws-sdk-go v1.44.252
Expand Down
4 changes: 2 additions & 2 deletions test/integration/test_app/sidecar-backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ RUN yum update -y && \
yum clean all && \
rm -rf /var/cache/yum

RUN curl -LO https://golang.org/dl/go1.20.3.linux-amd64.tar.gz && \
tar -C /usr/local -xzvf go1.20.3.linux-amd64.tar.gz
RUN curl -LO https://golang.org/dl/go1.22.1.linux-amd64.tar.gz && \
tar -C /usr/local -xzvf go1.22.1.linux-amd64.tar.gz

ENV PATH="${PATH}:/usr/local/go/bin"
ENV GOPATH="${HOME}/go"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/test_app/sidecar-backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module colorapp

go 1.20
go 1.22
4 changes: 2 additions & 2 deletions test/integration/test_app/sidecar-frontend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ RUN yum update -y && \
yum clean all && \
rm -rf /var/cache/yum

RUN curl -LO https://golang.org/dl/go1.20.3.linux-amd64.tar.gz && \
tar -C /usr/local -xzvf go1.20.3.linux-amd64.tar.gz
RUN curl -LO https://golang.org/dl/go1.22.1.linux-amd64.tar.gz && \
tar -C /usr/local -xzvf go1.22.1.linux-amd64.tar.gz

ENV PATH="${PATH}:/usr/local/go/bin"
ENV GOPATH="${HOME}/go"
Expand Down
2 changes: 1 addition & 1 deletion test/integration/test_app/sidecar-frontend/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module feapp

go 1.20
go 1.22

require (
k8s.io/apimachinery v0.25.2
Expand Down

0 comments on commit 72aeac8

Please sign in to comment.