mirror of
				https://github.com/coredns/coredns.git
				synced 2025-10-30 09:43:17 -04:00 
			
		
		
		
	Repo controlled Go version (#6526)
* Repo controlled Go version Signed-off-by: xdu31 <jasonxdu@amazon.com> * Bump to go1.21.8 for CVE update Signed-off-by: xdu31 <jasonxdu@amazon.com> --------- Signed-off-by: xdu31 <jasonxdu@amazon.com>
This commit is contained in:
		
							
								
								
									
										5
									
								
								.github/workflows/go.coverage.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/go.coverage.yml
									
									
									
									
										vendored
									
									
								
							| @@ -11,10 +11,13 @@ jobs: | |||||||
|       - name: Check out code |       - name: Check out code | ||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|  |  | ||||||
|  |       - name: Setup Go Version | ||||||
|  |         run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV | ||||||
|  |  | ||||||
|       - name: Install Go |       - name: Install Go | ||||||
|         uses: actions/setup-go@v5 |         uses: actions/setup-go@v5 | ||||||
|         with: |         with: | ||||||
|           go-version: '~1.21.0' |           go-version: ${{ env.GO_VERSION }} | ||||||
|         id: go |         id: go | ||||||
|  |  | ||||||
|       - name: Build |       - name: Build | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								.github/workflows/go.test.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/go.test.yml
									
									
									
									
										vendored
									
									
								
							| @@ -11,10 +11,13 @@ jobs: | |||||||
|       - name: Check out code |       - name: Check out code | ||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|  |  | ||||||
|  |       - name: Setup Go Version | ||||||
|  |         run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV | ||||||
|  |  | ||||||
|       - name: Install Go |       - name: Install Go | ||||||
|         uses: actions/setup-go@v5 |         uses: actions/setup-go@v5 | ||||||
|         with: |         with: | ||||||
|           go-version: '~1.21.0' |           go-version: ${{ env.GO_VERSION }} | ||||||
|         id: go |         id: go | ||||||
|  |  | ||||||
|       - name: Build |       - name: Build | ||||||
| @@ -33,10 +36,13 @@ jobs: | |||||||
|       - name: Check out code |       - name: Check out code | ||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|  |  | ||||||
|  |       - name: Setup Go Version | ||||||
|  |         run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV | ||||||
|  |  | ||||||
|       - name: Install Go |       - name: Install Go | ||||||
|         uses: actions/setup-go@v5 |         uses: actions/setup-go@v5 | ||||||
|         with: |         with: | ||||||
|           go-version: '~1.21.0' |           go-version: ${{ env.GO_VERSION }} | ||||||
|         id: go |         id: go | ||||||
|  |  | ||||||
|       - name: Build |       - name: Build | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								.github/workflows/golangci-lint.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/golangci-lint.yml
									
									
									
									
										vendored
									
									
								
							| @@ -7,9 +7,11 @@ jobs: | |||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/checkout@v4 |       - uses: actions/checkout@v4 | ||||||
|  |       - name: Setup Go Version | ||||||
|  |         run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV | ||||||
|       - uses: actions/setup-go@v5 |       - uses: actions/setup-go@v5 | ||||||
|         with: |         with: | ||||||
|           go-version: '~1.21.0' |           go-version: ${{ env.GO_VERSION }} | ||||||
|       - name: golangci-lint |       - name: golangci-lint | ||||||
|         uses: golangci/golangci-lint-action@v3.7.0 |         uses: golangci/golangci-lint-action@v3.7.0 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										5
									
								
								.github/workflows/make.doc.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/make.doc.yml
									
									
									
									
										vendored
									
									
								
							| @@ -15,10 +15,13 @@ jobs: | |||||||
|       - name: Checkout |       - name: Checkout | ||||||
|         uses: actions/checkout@v4 |         uses: actions/checkout@v4 | ||||||
|  |  | ||||||
|  |       - name: Setup Go Version | ||||||
|  |         run: echo "GO_VERSION=$(cat .go-version)" >> $GITHUB_ENV | ||||||
|  |  | ||||||
|       - name: Setup Go |       - name: Setup Go | ||||||
|         uses: actions/setup-go@v5 |         uses: actions/setup-go@v5 | ||||||
|         with: |         with: | ||||||
|           go-version: '~1.21.0' |           go-version: ${{ env.GO_VERSION }} | ||||||
|  |  | ||||||
|       - name: Update Docs |       - name: Update Docs | ||||||
|         run: | |         run: | | ||||||
|   | |||||||
							
								
								
									
										1
									
								
								.go-version
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								.go-version
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1 @@ | |||||||
|  | 1.21.8 | ||||||
							
								
								
									
										4
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
									
									
									
									
								
							| @@ -7,6 +7,10 @@ BUILDOPTS?=-v | |||||||
| GOPATH?=$(HOME)/go | GOPATH?=$(HOME)/go | ||||||
| MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) | MAKEPWD:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) | ||||||
| CGO_ENABLED?=0 | CGO_ENABLED?=0 | ||||||
|  | GOLANG_VERSION ?= $(shell cat .go-version) | ||||||
|  |  | ||||||
|  | export GOSUMDB = sum.golang.org | ||||||
|  | export GOTOOLCHAIN = go$(GOLANG_VERSION) | ||||||
|  |  | ||||||
| .PHONY: all | .PHONY: all | ||||||
| all: coredns | all: coredns | ||||||
|   | |||||||
| @@ -52,6 +52,10 @@ NAME:=coredns | |||||||
| VERSION:=$(shell grep 'CoreVersion' coremain/version.go | awk '{ print $$3 }' | tr -d '"') | VERSION:=$(shell grep 'CoreVersion' coremain/version.go | awk '{ print $$3 }' | tr -d '"') | ||||||
| GITHUB:=coredns | GITHUB:=coredns | ||||||
| LINUX_ARCH:=amd64 arm arm64 mips64le ppc64le s390x mips riscv64 | 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: | all: | ||||||
| 	@echo Use the 'release' target to build a release | 	@echo Use the 'release' target to build a release | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user