TUN-4795: Remove Equinox releases
This commit is contained in:
parent
e49a7a4389
commit
b8333b44a2
|
@ -1,5 +1,10 @@
|
||||||
**Experimental**: This is a new format for release notes. The format and availability is subject to change.
|
**Experimental**: This is a new format for release notes. The format and availability is subject to change.
|
||||||
|
|
||||||
|
## 2021.8.2
|
||||||
|
### Improvements
|
||||||
|
- Because Equinox os shutting down, all cloudflared releases are now present [here](https://github.com/cloudflare/cloudflared/releases).
|
||||||
|
[Equinox](https://dl.equinox.io/cloudflare/cloudflared/stable) will no longer receive updates.
|
||||||
|
|
||||||
## 2021.8.0
|
## 2021.8.0
|
||||||
### Bug fixes
|
### Bug fixes
|
||||||
- Prevents tunnel from accidentally running when only proxy-dns should run.
|
- Prevents tunnel from accidentally running when only proxy-dns should run.
|
||||||
|
|
19
Makefile
19
Makefile
|
@ -26,16 +26,6 @@ PACKAGE_DIR := $(CURDIR)/packaging
|
||||||
INSTALL_BINDIR := /usr/bin/
|
INSTALL_BINDIR := /usr/bin/
|
||||||
MAN_DIR := /usr/share/man/man1/
|
MAN_DIR := /usr/share/man/man1/
|
||||||
|
|
||||||
EQUINOX_FLAGS = --version="$(VERSION)" \
|
|
||||||
--platforms="$(EQUINOX_BUILD_PLATFORMS)" \
|
|
||||||
--app="$(EQUINOX_APP_ID)" \
|
|
||||||
--token="$(EQUINOX_TOKEN)" \
|
|
||||||
--channel="$(EQUINOX_CHANNEL)"
|
|
||||||
|
|
||||||
ifeq ($(EQUINOX_IS_DRAFT), true)
|
|
||||||
EQUINOX_FLAGS := --draft $(EQUINOX_FLAGS)
|
|
||||||
endif
|
|
||||||
|
|
||||||
LOCAL_ARCH ?= $(shell uname -m)
|
LOCAL_ARCH ?= $(shell uname -m)
|
||||||
ifneq ($(GOARCH),)
|
ifneq ($(GOARCH),)
|
||||||
TARGET_ARCH ?= $(GOARCH)
|
TARGET_ARCH ?= $(GOARCH)
|
||||||
|
@ -231,10 +221,6 @@ homebrew-upload: cloudflared-darwin-amd64.tgz
|
||||||
homebrew-release: homebrew-upload
|
homebrew-release: homebrew-upload
|
||||||
./publish-homebrew-formula.sh cloudflared-darwin-amd64.tgz $(VERSION) homebrew-cloudflare
|
./publish-homebrew-formula.sh cloudflared-darwin-amd64.tgz $(VERSION) homebrew-cloudflare
|
||||||
|
|
||||||
.PHONY: release
|
|
||||||
release: bin/equinox
|
|
||||||
bin/equinox release $(EQUINOX_FLAGS) -- $(VERSION_FLAGS) $(IMPORT_PATH)/cmd/cloudflared
|
|
||||||
|
|
||||||
.PHONY: github-release
|
.PHONY: github-release
|
||||||
github-release: cloudflared
|
github-release: cloudflared
|
||||||
python3 github_release.py --path $(EXECUTABLE_PATH) --release-version $(VERSION)
|
python3 github_release.py --path $(EXECUTABLE_PATH) --release-version $(VERSION)
|
||||||
|
@ -252,11 +238,6 @@ github-mac-upload:
|
||||||
python3 github_release.py --path artifacts/cloudflared-darwin-amd64.tgz --release-version $(VERSION) --name cloudflared-darwin-amd64.tgz
|
python3 github_release.py --path artifacts/cloudflared-darwin-amd64.tgz --release-version $(VERSION) --name cloudflared-darwin-amd64.tgz
|
||||||
python3 github_release.py --path artifacts/cloudflared-amd64.pkg --release-version $(VERSION) --name cloudflared-amd64.pkg
|
python3 github_release.py --path artifacts/cloudflared-amd64.pkg --release-version $(VERSION) --name cloudflared-amd64.pkg
|
||||||
|
|
||||||
bin/equinox:
|
|
||||||
mkdir -p bin
|
|
||||||
curl -s https://bin.equinox.io/c/75JtLRTsJ3n/release-tool-beta-$(EQUINOX_PLATFORM).tgz | tar xz -C bin/
|
|
||||||
|
|
||||||
|
|
||||||
.PHONY: tunnelrpc-deps
|
.PHONY: tunnelrpc-deps
|
||||||
tunnelrpc-deps:
|
tunnelrpc-deps:
|
||||||
which capnp # https://capnproto.org/install.html
|
which capnp # https://capnproto.org/install.html
|
||||||
|
|
50
cfsetup.yaml
50
cfsetup.yaml
|
@ -98,56 +98,6 @@ stretch: &stretch
|
||||||
- export GOARCH=amd64
|
- export GOARCH=amd64
|
||||||
- export FIPS=true
|
- export FIPS=true
|
||||||
- make publish-deb
|
- make publish-deb
|
||||||
release-linux-amd64:
|
|
||||||
build_dir: *build_dir
|
|
||||||
builddeps:
|
|
||||||
- *pinned_go_fips
|
|
||||||
- build-essential
|
|
||||||
post-cache:
|
|
||||||
- export GOOS=linux
|
|
||||||
- export GOARCH=amd64
|
|
||||||
- export FIPS=true
|
|
||||||
- make release
|
|
||||||
release-linux-armv6:
|
|
||||||
build_dir: *build_dir
|
|
||||||
builddeps:
|
|
||||||
- *pinned_go
|
|
||||||
- crossbuild-essential-armhf
|
|
||||||
- gcc-arm-linux-gnueabihf
|
|
||||||
post-cache:
|
|
||||||
- export GOOS=linux
|
|
||||||
- export GOARCH=arm
|
|
||||||
- export CC=arm-linux-gnueabihf-gcc
|
|
||||||
- make release
|
|
||||||
release-linux-386:
|
|
||||||
build_dir: *build_dir
|
|
||||||
builddeps:
|
|
||||||
- *pinned_go
|
|
||||||
- gcc-multilib
|
|
||||||
post-cache:
|
|
||||||
- export GOOS=linux
|
|
||||||
- export GOARCH=386
|
|
||||||
- make release
|
|
||||||
release-windows-amd64:
|
|
||||||
build_dir: *build_dir
|
|
||||||
builddeps:
|
|
||||||
- *pinned_go
|
|
||||||
- gcc-mingw-w64
|
|
||||||
post-cache:
|
|
||||||
- export GOOS=windows
|
|
||||||
- export GOARCH=amd64
|
|
||||||
- export CC=x86_64-w64-mingw32-gcc
|
|
||||||
- make release
|
|
||||||
release-windows-386:
|
|
||||||
build_dir: *build_dir
|
|
||||||
builddeps:
|
|
||||||
- *pinned_go
|
|
||||||
- gcc-mingw-w64
|
|
||||||
post-cache:
|
|
||||||
- export GOOS=windows
|
|
||||||
- export GOARCH=386
|
|
||||||
- export CC=i686-w64-mingw32-gcc-win32
|
|
||||||
- make release
|
|
||||||
github-release-macos-amd64:
|
github-release-macos-amd64:
|
||||||
build_dir: *build_dir
|
build_dir: *build_dir
|
||||||
builddeps:
|
builddeps:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
FROM python:3-buster
|
FROM python:3-buster
|
||||||
|
|
||||||
RUN wget https://bin.equinox.io/c/VdrWdbjqyF/cloudflared-stable-linux-amd64.deb \
|
RUN wget https://github.com/cloudflare/cloudflared/releases/latest/download/cloudflared-linux-amd64.deb \
|
||||||
&& dpkg -i cloudflared-stable-linux-amd64.deb
|
&& dpkg -i cloudflared-linux-amd64.deb
|
||||||
|
|
||||||
RUN pip install pexpect
|
RUN pip install pexpect
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue