Skip to content

Commit 43a3ba3

Browse files
jcsfjcsf
committed
TUN-9495: Remove references to cloudflare-go
## Summary When bumping cloudflared to use go1.24, we no longer need cloudflare-go, since most of the PQ and FIPS compliant curves are already available in go 1.24. Therefore, we can remove everything related with installing our go toolchain.
1 parent 47085ee commit 43a3ba3

File tree

6 files changed

+3
-68
lines changed

6 files changed

+3
-68
lines changed

‎.teamcity/install-cloudflare-go.sh‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎.teamcity/mac/install-cloudflare-go.sh‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎.teamcity/windows/install-cloudflare-go.ps1‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎.teamcity/windows/install-go-msi.ps1‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎Makefile‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ PACKAGE_DIR := $(CURDIR)/packaging
5656
PREFIX := /usr
5757
INSTALL_BINDIR := $(PREFIX)/bin/
5858
INSTALL_MANDIR := $(PREFIX)/share/man/man1/
59-
CF_GO_PATH := /tmp/go
60-
PATH := $(CF_GO_PATH)/bin:$(PATH)
6159

6260
LOCAL_ARCH ?= $(shell uname -m)
6361
ifneq ($(GOARCH),)
@@ -183,19 +181,10 @@ fuzz:
183181
@go test -fuzz=FuzzNewIdentity -fuzztime=600s ./tracing
184182
@go test -fuzz=FuzzNewAccessValidator -fuzztime=600s ./validation
185183

186-
.PHONY: install-go
187-
install-go:
188-
rm -rf ${CF_GO_PATH}
189-
./.teamcity/install-cloudflare-go.sh
190-
191-
.PHONY: cleanup-go
192-
cleanup-go:
193-
rm -rf ${CF_GO_PATH}
194-
195184
cloudflared.1: cloudflared_man_template
196185
sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' cloudflared_man_template > cloudflared.1
197186

198-
install: install-go cloudflared cloudflared.1 cleanup-go
187+
install: cloudflared cloudflared.1
199188
mkdir -p $(DESTDIR)$(INSTALL_BINDIR) $(DESTDIR)$(INSTALL_MANDIR)
200189
install -m755 cloudflared $(DESTDIR)$(INSTALL_BINDIR)/cloudflared
201190
install -m644 cloudflared.1 $(DESTDIR)$(INSTALL_MANDIR)/cloudflared.1

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Downloads are available as standalone binaries, a Docker image, and Debian, RPM,
3131
* Binaries, Debian, and RPM packages for Linux [can be found here](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation#linux)
3232
* A Docker image of `cloudflared` is [available on DockerHub](https://hub.docker.com/r/cloudflare/cloudflared)
3333
* You can install on Windows machines with the [steps here](https://developers.cloudflare.com/cloudflare-one/connections/connect-apps/install-and-setup/installation#windows)
34-
* To build from source, first you need to download the go toolchain by running `./.teamcity/install-cloudflare-go.sh` and follow the output. Then you can run `make cloudflared`
34+
* To build from source, install the required version of go, mentioned in the [Development](#development) section below. Then you can run `make cloudflared`.
3535

3636
User documentation for Cloudflare Tunnel can be found at https://developers.cloudflare.com/cloudflare-one/connections/connect-apps
3737

@@ -62,7 +62,7 @@ For example, as of January 2023 Cloudflare will support cloudflared version 2023
6262
### Requirements
6363
- [GNU Make](https://www.gnu.org/software/make/)
6464
- [capnp](https://capnproto.org/install.html)
65-
- [cloudflare go toolchain](https://github.com/cloudflare/go)
65+
- [go >= 1.24](https://go.dev/doc/install)
6666
- Optional tools:
6767
- [capnpc-go](https://pkg.go.dev/zombiezen.com/go/capnproto2/capnpc-go)
6868
- [goimports](https://pkg.go.dev/golang.org/x/tools/cmd/goimports)

0 commit comments

Comments
 (0)