Skip to content

Commit ef3152f

Browse files
committed
TUN-5631: Build everything with go 1.17.5
1 parent d6036d9 commit ef3152f

File tree

2 files changed

+6
-19
lines changed

2 files changed

+6
-19
lines changed

cfsetup.yaml

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
pinned_go: &pinned_go go=1.17-1
2-
pinned_go_fips: &pinned_go_fips go-boring=1.16.6-7
1+
pinned_go: &pinned_go go=1.17.5-1
2+
pinned_go_fips: &pinned_go_fips go-boring=1.17.5-1
33

44
build_dir: &build_dir /cfsetup_build
55
default-flavor: buster
@@ -244,23 +244,10 @@ centos-7:
244244
pre-cache:
245245
- yum install -y fakeroot
246246
- yum upgrade -y binutils-2.27-44.base.el7.x86_64
247-
- wget https://golang.org/dl/go1.16.3.linux-amd64.tar.gz -P /tmp/
248-
- tar -C /usr/local -xzf /tmp/go1.16.3.linux-amd64.tar.gz
247+
- wget https://go.dev/dl/go1.17.5.linux-amd64.tar.gz -P /tmp/
248+
- tar -C /usr/local -xzf /tmp/go1.17.5.linux-amd64.tar.gz
249249
post-cache:
250250
- export PATH=$PATH:/usr/local/go/bin
251251
- export GOOS=linux
252252
- export GOARCH=amd64
253-
- make publish-rpm
254-
build-rpm:
255-
build_dir: *build_dir
256-
builddeps: *el7_builddeps
257-
pre-cache:
258-
- yum install -y fakeroot
259-
- yum upgrade -y binutils-2.27-44.base.el7.x86_64
260-
- wget https://golang.org/dl/go1.16.3.linux-amd64.tar.gz -P /tmp/
261-
- tar -C /usr/local -xzf /tmp/go1.16.3.linux-amd64.tar.gz
262-
post-cache:
263-
- export PATH=$PATH:/usr/local/go/bin
264-
- export GOOS=linux
265-
- export GOARCH=amd64
266-
- make cloudflared-rpm
253+
- make publish-rpm

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.16.4 as builder
1+
FROM golang:1.17.5 as builder
22
ENV GO111MODULE=on \
33
CGO_ENABLED=0
44
WORKDIR /go/src/github.com/cloudflare/cloudflared/

0 commit comments

Comments
 (0)