Repo controlled Go version

Signed-off-by: xdu31 <jasonxdu@amazon.com>
xdu31 · Mar 5, 2024 · c4e1e48 · c4e1e48
1 parent 8868454
commit c4e1e48
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/go.coverage.yml b/.github/workflows/go.coverage.yml
@@ -11,10 +11,13 @@ jobs:
  - name: Check out code
  uses: actions/checkout@v4
 
+ - name: Setup Go Version
+ run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: '~1.21.0'
+ go-version: ${{ env.GO_VERSION }}
  id: go
 
  - name: Build

diff --git a/.github/workflows/go.test.yml b/.github/workflows/go.test.yml
@@ -11,10 +11,13 @@ jobs:
  - name: Check out code
  uses: actions/checkout@v4
 
+ - name: Setup Go Version
+ run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: '~1.21.0'
+ go-version: ${{ env.GO_VERSION }}
  id: go
 
  - name: Build
@@ -33,10 +36,13 @@ jobs:
  - name: Check out code
  uses: actions/checkout@v4
 
+ - name: Setup Go Version
+ run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+
  - name: Install Go
  uses: actions/setup-go@v5
  with:
- go-version: '~1.21.0'
+ go-version: ${{ env.GO_VERSION }}
  id: go
 
  - name: Build

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -7,9 +7,11 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - uses: actions/checkout@v4
+ - name: Setup Go Version
+ run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
  - uses: actions/setup-go@v5
  with:
- go-version: '~1.21.0'
+ go-version: ${{ env.GO_VERSION }}
  - name: golangci-lint
  uses: golangci/golangci-lint-action@v3.7.0
  with:

diff --git a/.github/workflows/make.doc.yml b/.github/workflows/make.doc.yml
@@ -15,10 +15,13 @@ jobs:
  - name: Checkout
  uses: actions/checkout@v4
 
+ - name: Setup Go Version
+ run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV
+
  - name: Setup Go
  uses: actions/setup-go@v5
  with:
- go-version: '~1.21.0'
+ go-version: ${{ env.GO_VERSION }}
 
  - name: Update Docs
  run: |

diff --git a/.go-version b/.go-version
@@ -0,0 +1 @@
+1.21.7
diff --git a/Makefile b/Makefile
@@ -7,6 +7,10 @@ BUILDOPTS?=-v
 GOPATH?=$(HOME)/go
 MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 CGO_ENABLED?=0
+GOLANG_VERSION ?= $(shell cat .go-version)
+
+export GOSUMDB = sum.golang.org
+export GOTOOLCHAIN = go$(GOLANG_VERSION)
 
 .PHONY: all
 all: coredns

diff --git a/Makefile.release b/Makefile.release
@@ -52,6 +52,10 @@ NAME:=coredns
 VERSION:=$(shell grep 'CoreVersion' coremain/version.go | awk '{ print $$3 }' | tr -d '"')
 GITHUB:=coredns
 LINUX_ARCH:=amd64 arm arm64 mips64le ppc64le s390x mips riscv64
+GOLANG_VERSION ?= $(shell cat .go-version)
+
+export GOSUMDB = sum.golang.org
+export GOTOOLCHAIN = go$(GOLANG_VERSION)
 
 all:
  @echo Use the 'release' target to build a release