From e007fb3364d37c3e3fa1f1d41ec828467ba45c77 Mon Sep 17 00:00:00 2001
From: Renato Valenzuela <valerena@amazon.com>
Date: Wed, 20 Mar 2024 18:03:20 +0000
Subject: [PATCH 1/2] chore(deps): Update to Go 1.22
---
Makefile | 2 +-
go.mod | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 1916dae..a820c3f 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ compile-lambda-linux-all:
make ARCH=old compile-lambda-linux
compile-with-docker:
- docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.21 make ARCH=${ARCH} compile-lambda-linux
+ docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.22 make ARCH=${ARCH} compile-lambda-linux
compile-lambda-linux:
CGO_ENABLED=0 GOOS=linux GOARCH=${GO_ARCH_${ARCH}} go build -buildvcs=false -ldflags "${RELEASE_BUILD_LINKER_FLAGS}" -o ${DESTINATION_${ARCH}} ./cmd/aws-lambda-rie
diff --git a/go.mod b/go.mod
index d48dc60..4ee45d7 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module go.amzn.com
-go 1.21
+go 1.22
require (
github.com/aws/aws-lambda-go v1.46.0
From 7fe887aa649c51f2f9ff70c491583dd6b18c6683 Mon Sep 17 00:00:00 2001
From: Renato Valenzuela <valerena@amazon.com>
Date: Wed, 27 Mar 2024 15:48:23 +0000
Subject: [PATCH 2/2] chore: Update Makefile to test in container
---
Makefile | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index a820c3f..6d36ae2 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,10 @@ DESTINATION_old:= bin/${BINARY_NAME}
DESTINATION_x86_64 := bin/${BINARY_NAME}-x86_64
DESTINATION_arm64 := bin/${BINARY_NAME}-arm64
+run_in_docker = docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.22 $(1)
+
compile-with-docker-all:
- make ARCH=x86_64 compile-with-docker
- make ARCH=arm64 compile-with-docker
- make ARCH=old compile-with-docker
+ $(call run_in_docker, make compile-lambda-linux-all)
compile-lambda-linux-all:
make ARCH=x86_64 compile-lambda-linux
@@ -21,11 +21,14 @@ compile-lambda-linux-all:
make ARCH=old compile-lambda-linux
compile-with-docker:
- docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:1.22 make ARCH=${ARCH} compile-lambda-linux
+ $(call run_in_docker, make ARCH=${ARCH} compile-lambda-linux)
compile-lambda-linux:
CGO_ENABLED=0 GOOS=linux GOARCH=${GO_ARCH_${ARCH}} go build -buildvcs=false -ldflags "${RELEASE_BUILD_LINKER_FLAGS}" -o ${DESTINATION_${ARCH}} ./cmd/aws-lambda-rie
+tests-with-docker:
+ $(call run_in_docker, make tests)
+
tests:
go test ./...
@@ -33,7 +36,7 @@ integ-tests-and-compile: tests
make compile-lambda-linux-all
make integ-tests
-integ-tests-with-docker: tests
+integ-tests-with-docker: tests-with-docker
make compile-with-docker-all
make integ-tests