diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 68551b3..0d10ef3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: '1.26.1' + go-version-file: go.mod - name: Run tests run: make tests-with-docker @@ -31,7 +31,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v6 with: - go-version: '1.26.1' + go-version-file: go.mod - name: Build env: diff --git a/Makefile b/Makefile index 8775994..a596dc1 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,8 @@ GO_ARCH_arm64 := arm64 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.26.1 $(1) +GO_VERSION := $(shell grep '^go ' go.mod | awk '{print $$2}') +run_in_docker = docker run --env GOPROXY=direct -v $(shell pwd):/LambdaRuntimeLocal -w /LambdaRuntimeLocal golang:$(GO_VERSION) $(1) compile-with-docker-all: $(call run_in_docker, make compile-lambda-linux-all) diff --git a/debugging/Makefile b/debugging/Makefile index 10eb5c8..df615f6 100644 --- a/debugging/Makefile +++ b/debugging/Makefile @@ -1,5 +1,6 @@ # Golang EOL overview: https://endoflife.date/go -DOCKER_GOLANG_IMAGE ?= golang:1.26.1-bookworm +GO_VERSION := $(shell grep '^go ' ../go.mod | awk '{print $$2}') +DOCKER_GOLANG_IMAGE ?= golang:$(GO_VERSION)-bookworm # On ARM hosts, use: make ARCH=arm64 build-init # Check host architecture: uname -m diff --git a/go.mod b/go.mod index 167ed10..5a0eecf 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/aws/aws-lambda-runtime-interface-emulator -go 1.26.1 +go 1.26.2 require ( github.com/aws/aws-lambda-go v1.52.0 diff --git a/renovate.json b/renovate.json index adb75da..4fef864 100644 --- a/renovate.json +++ b/renovate.json @@ -11,11 +11,6 @@ "rangeStrategy": "bump", "groupName": "Go toolchain" }, - { - "matchManagers": ["github-actions"], - "matchDepNames": ["go"], - "groupName": "Go toolchain" - }, { "matchManagers": ["gomod"], "excludePackageNames": ["go"],