Move to golang 1.14
This commit is contained in:
		
							parent
							
								
									c243b1a8bc
								
							
						
					
					
						commit
						86d717dd85
					
				| 
						 | 
					@ -11,7 +11,7 @@ env:
 | 
				
			||||||
    - KUBECONFIG=$HOME/.kube/config
 | 
					    - KUBECONFIG=$HOME/.kube/config
 | 
				
			||||||
 | 
					
 | 
				
			||||||
go:
 | 
					go:
 | 
				
			||||||
  - 1.13.x
 | 
					  - 1.14.x
 | 
				
			||||||
 | 
					
 | 
				
			||||||
before_install:
 | 
					before_install:
 | 
				
			||||||
  - |
 | 
					  - |
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										2
									
								
								Makefile
								
								
								
								
							| 
						 | 
					@ -212,7 +212,7 @@ PLATFORM  = $(shell echo $(UNAME_S) | tr A-Z a-z)
 | 
				
			||||||
staticcheck: ## Verifies `staticcheck` passes
 | 
					staticcheck: ## Verifies `staticcheck` passes
 | 
				
			||||||
	@echo "+ $@"
 | 
						@echo "+ $@"
 | 
				
			||||||
ifndef HAS_STATICCHECK
 | 
					ifndef HAS_STATICCHECK
 | 
				
			||||||
	wget -O staticcheck_$(PLATFORM)_amd64.tar.gz https://github.com/dominikh/go-tools/releases/download/2019.2.3/staticcheck_$(PLATFORM)_amd64.tar.gz
 | 
						wget -O staticcheck_$(PLATFORM)_amd64.tar.gz https://github.com/dominikh/go-tools/releases/download/2020.1.3/staticcheck_$(PLATFORM)_amd64.tar.gz
 | 
				
			||||||
	tar zxvf staticcheck_$(PLATFORM)_amd64.tar.gz
 | 
						tar zxvf staticcheck_$(PLATFORM)_amd64.tar.gz
 | 
				
			||||||
	mkdir -p $(GOPATH)/bin
 | 
						mkdir -p $(GOPATH)/bin
 | 
				
			||||||
	mv staticcheck/staticcheck $(GOPATH)/bin
 | 
						mv staticcheck/staticcheck $(GOPATH)/bin
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
ARG GO_VERSION
 | 
					ARG GO_VERSION
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# build stage
 | 
					# build stage
 | 
				
			||||||
FROM golang:$GO_VERSION-alpine3.10 AS build-stage
 | 
					FROM golang:$GO_VERSION-alpine3.11 AS build-stage
 | 
				
			||||||
ARG OPERATOR_SDK_VERSION
 | 
					ARG OPERATOR_SDK_VERSION
 | 
				
			||||||
ENV GO111MODULE=on
 | 
					ENV GO111MODULE=on
 | 
				
			||||||
RUN apk --no-cache add git curl make \
 | 
					RUN apk --no-cache add git curl make \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7,7 +7,7 @@ def workdir = "${workspace}/src/github.com/jenkinsci/kubernetes-operator/"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
podTemplate(label: label,
 | 
					podTemplate(label: label,
 | 
				
			||||||
        containers: [
 | 
					        containers: [
 | 
				
			||||||
                containerTemplate(name: 'alpine', image: 'alpine:3.10.2', ttyEnabled: true, command: 'cat'),
 | 
					                containerTemplate(name: 'alpine', image: 'alpine:3.11', ttyEnabled: true, command: 'cat'),
 | 
				
			||||||
        ],
 | 
					        ],
 | 
				
			||||||
        ) {
 | 
					        ) {
 | 
				
			||||||
    node(label) {
 | 
					    node(label) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
# Setup variables for the Makefile
 | 
					# Setup variables for the Makefile
 | 
				
			||||||
NAME=kubernetes-operator
 | 
					NAME=kubernetes-operator
 | 
				
			||||||
OPERATOR_SDK_VERSION=0.17.0
 | 
					OPERATOR_SDK_VERSION=0.17.0
 | 
				
			||||||
GO_VERSION=1.13.1
 | 
					GO_VERSION=1.14.2
 | 
				
			||||||
PKG=github.com/jenkinsci/kubernetes-operator
 | 
					PKG=github.com/jenkinsci/kubernetes-operator
 | 
				
			||||||
DOCKER_ORGANIZATION=virtuslab
 | 
					DOCKER_ORGANIZATION=virtuslab
 | 
				
			||||||
DOCKER_REGISTRY=jenkins-operator
 | 
					DOCKER_REGISTRY=jenkins-operator
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue