Skip to content

Commit b8333b4

Browse files
TUN-4795: Remove Equinox releases
1 parent e49a7a4 commit b8333b4

File tree

4 files changed

+7
-71
lines changed

4 files changed

+7
-71
lines changed

CHANGES.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
**Experimental**: This is a new format for release notes. The format and availability is subject to change.
22

3+
## 2021.8.2
4+
### Improvements
5+
- Because Equinox os shutting down, all cloudflared releases are now present [here](https://github.com/cloudflare/cloudflared/releases).
6+
[Equinox](https://dl.equinox.io/cloudflare/cloudflared/stable) will no longer receive updates.
7+
38
## 2021.8.0
49
### Bug fixes
510
- Prevents tunnel from accidentally running when only proxy-dns should run.

Makefile

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,6 @@ PACKAGE_DIR := $(CURDIR)/packaging
2626
INSTALL_BINDIR := /usr/bin/
2727
MAN_DIR := /usr/share/man/man1/
2828

29-
EQUINOX_FLAGS = --version="$(VERSION)" \
30-
--platforms="$(EQUINOX_BUILD_PLATFORMS)" \
31-
--app="$(EQUINOX_APP_ID)" \
32-
--token="$(EQUINOX_TOKEN)" \
33-
--channel="$(EQUINOX_CHANNEL)"
34-
35-
ifeq ($(EQUINOX_IS_DRAFT), true)
36-
EQUINOX_FLAGS := --draft $(EQUINOX_FLAGS)
37-
endif
38-
3929
LOCAL_ARCH ?= $(shell uname -m)
4030
ifneq ($(GOARCH),)
4131
TARGET_ARCH ?= $(GOARCH)
@@ -231,10 +221,6 @@ homebrew-upload: cloudflared-darwin-amd64.tgz
231221
homebrew-release: homebrew-upload
232222
./publish-homebrew-formula.sh cloudflared-darwin-amd64.tgz $(VERSION) homebrew-cloudflare
233223

234-
.PHONY: release
235-
release: bin/equinox
236-
bin/equinox release $(EQUINOX_FLAGS) -- $(VERSION_FLAGS) $(IMPORT_PATH)/cmd/cloudflared
237-
238224
.PHONY: github-release
239225
github-release: cloudflared
240226
python3 github_release.py --path $(EXECUTABLE_PATH) --release-version $(VERSION)
@@ -252,11 +238,6 @@ github-mac-upload:
252238
python3 github_release.py --path artifacts/cloudflared-darwin-amd64.tgz --release-version $(VERSION) --name cloudflared-darwin-amd64.tgz
253239
python3 github_release.py --path artifacts/cloudflared-amd64.pkg --release-version $(VERSION) --name cloudflared-amd64.pkg
254240

255-
bin/equinox:
256-
mkdir -p bin
257-
curl -s https://bin.equinox.io/c/75JtLRTsJ3n/release-tool-beta-$(EQUINOX_PLATFORM).tgz | tar xz -C bin/
258-
259-
260241
.PHONY: tunnelrpc-deps
261242
tunnelrpc-deps:
262243
which capnp # https://capnproto.org/install.html

cfsetup.yaml

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -98,56 +98,6 @@ stretch: &stretch
9898
- export GOARCH=amd64
9999
- export FIPS=true
100100
- make publish-deb
101-
release-linux-amd64:
102-
build_dir: *build_dir
103-
builddeps:
104-
- *pinned_go_fips
105-
- build-essential
106-
post-cache:
107-
- export GOOS=linux
108-
- export GOARCH=amd64
109-
- export FIPS=true
110-
- make release
111-
release-linux-armv6:
112-
build_dir: *build_dir
113-
builddeps:
114-
- *pinned_go
115-
- crossbuild-essential-armhf
116-
- gcc-arm-linux-gnueabihf
117-
post-cache:
118-
- export GOOS=linux
119-
- export GOARCH=arm
120-
- export CC=arm-linux-gnueabihf-gcc
121-
- make release
122-
release-linux-386:
123-
build_dir: *build_dir
124-
builddeps:
125-
- *pinned_go
126-
- gcc-multilib
127-
post-cache:
128-
- export GOOS=linux
129-
- export GOARCH=386
130-
- make release
131-
release-windows-amd64:
132-
build_dir: *build_dir
133-
builddeps:
134-
- *pinned_go
135-
- gcc-mingw-w64
136-
post-cache:
137-
- export GOOS=windows
138-
- export GOARCH=amd64
139-
- export CC=x86_64-w64-mingw32-gcc
140-
- make release
141-
release-windows-386:
142-
build_dir: *build_dir
143-
builddeps:
144-
- *pinned_go
145-
- gcc-mingw-w64
146-
post-cache:
147-
- export GOOS=windows
148-
- export GOARCH=386
149-
- export CC=i686-w64-mingw32-gcc-win32
150-
- make release
151101
github-release-macos-amd64:
152102
build_dir: *build_dir
153103
builddeps:

ssh_server_tests/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM python:3-buster
22

3-
RUN wget https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-amd64.deb \
4-
&& dpkg -i cloudflared-stable-linux-amd64.deb
3+
RUN wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb \
4+
&& dpkg -i cloudflared-linux-amd64.deb
55

66
RUN pip install pexpect
77

0 commit comments

Comments
 (0)