From ef3152f3345055422c662ff7ac26e010631054e3 Mon Sep 17 00:00:00 2001 From: cthuang Date: Mon, 10 Jan 2022 10:02:41 +0000 Subject: [PATCH] TUN-5631: Build everything with go 1.17.5 --- cfsetup.yaml | 23 +++++------------------ dev.Dockerfile | 2 +- 2 files changed, 6 insertions(+), 19 deletions(-) diff --git a/cfsetup.yaml b/cfsetup.yaml index f8e019be..0478e4c1 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -1,5 +1,5 @@ -pinned_go: &pinned_go go=1.17-1 -pinned_go_fips: &pinned_go_fips go-boring=1.16.6-7 +pinned_go: &pinned_go go=1.17.5-1 +pinned_go_fips: &pinned_go_fips go-boring=1.17.5-1 build_dir: &build_dir /cfsetup_build default-flavor: buster @@ -244,23 +244,10 @@ centos-7: pre-cache: - yum install -y fakeroot - yum upgrade -y binutils-2.27-44.base.el7.x86_64 - - wget https://golang.org/dl/go1.16.3.linux-amd64.tar.gz -P /tmp/ - - tar -C /usr/local -xzf /tmp/go1.16.3.linux-amd64.tar.gz + - wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz -P /tmp/ + - tar -C /usr/local -xzf /tmp/go1.17.5.linux-amd64.tar.gz post-cache: - export PATH=$PATH:/usr/local/go/bin - export GOOS=linux - export GOARCH=amd64 - - make publish-rpm - build-rpm: - build_dir: *build_dir - builddeps: *el7_builddeps - pre-cache: - - yum install -y fakeroot - - yum upgrade -y binutils-2.27-44.base.el7.x86_64 - - wget https://golang.org/dl/go1.16.3.linux-amd64.tar.gz -P /tmp/ - - tar -C /usr/local -xzf /tmp/go1.16.3.linux-amd64.tar.gz - post-cache: - - export PATH=$PATH:/usr/local/go/bin - - export GOOS=linux - - export GOARCH=amd64 - - make cloudflared-rpm + - make publish-rpm \ No newline at end of file diff --git a/dev.Dockerfile b/dev.Dockerfile index a9197c9b..add922fb 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.16.4 as builder +FROM golang:1.17.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 WORKDIR /go/src/github.com/cloudflare/cloudflared/