diff options
| -rw-r--r-- | .github/workflows/go.coverage.yml | 5 | ||||
| -rw-r--r-- | .github/workflows/go.test.yml | 10 | ||||
| -rw-r--r-- | .github/workflows/golangci-lint.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/make.doc.yml | 5 | ||||
| -rw-r--r-- | .go-version | 1 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | Makefile.release | 4 |
7 files changed, 28 insertions, 5 deletions
diff --git a/.github/workflows/go.coverage.yml b/.github/workflows/go.coverage.yml index b7d735a14..e9d9a0ab6 100644 --- 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 index fbd1f7ff6..5f6d5bd0a 100644 --- 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 index 2c4579d3c..471d6e0e7 100644 --- 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 index ef0025331..10ac48773 100644 --- 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 new file mode 100644 index 000000000..428abfd24 --- /dev/null +++ b/.go-version @@ -0,0 +1 @@ +1.21.8 @@ -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 index f28a8ddcd..bc4108fd5 100644 --- 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 |