Skip to content

Commit 5b30925

Browse files
TUN-6755: Remove unused publish functions
We no longer need the functions that publish deb and rpm to the old pkg.cloudflare.com backed since we now send them to R2.
1 parent d7fb18b commit 5b30925

File tree

2 files changed

+0
-43
lines changed

2 files changed

+0
-43
lines changed

Makefile

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -145,22 +145,6 @@ endif
145145
test-ssh-server:
146146
docker-compose -f ssh_server_tests/docker-compose.yml up
147147

148-
define publish_package
149-
chmod 664 $(BINARY_NAME)*.$(1); \
150-
for HOST in $(CF_PKG_HOSTS); do \
151-
ssh-keyscan -t ecdsa $$HOST >> ~/.ssh/known_hosts; \
152-
scp -p -4 $(BINARY_NAME)*.$(1) cfsync@$$HOST:/state/cf-pkg/staging/$(2)/$(TARGET_PUBLIC_REPO)/$(BINARY_NAME)/; \
153-
done
154-
endef
155-
156-
.PHONY: publish-deb
157-
publish-deb: cloudflared-deb
158-
$(call publish_package,deb,apt)
159-
160-
.PHONY: publish-rpm
161-
publish-rpm: cloudflared-rpm
162-
$(call publish_package,rpm,yum)
163-
164148
cloudflared.1: cloudflared_man_template
165149
cat cloudflared_man_template | sed -e 's/\$${VERSION}/$(VERSION)/; s/\$${DATE}/$(DATE)/' > cloudflared.1
166150

cfsetup.yaml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,6 @@ stretch: &stretch
119119
- export GOOS=linux
120120
- export GOARCH=arm64
121121
- make cloudflared-deb
122-
publish-deb:
123-
build_dir: *build_dir
124-
builddeps:
125-
- *pinned_go
126-
- build-essential
127-
- fakeroot
128-
- rubygem-fpm
129-
- openssh-client
130-
post-cache:
131-
- export GOOS=linux
132-
- export GOARCH=amd64
133-
- make publish-deb
134122
github-release-macos-amd64:
135123
build_dir: *build_dir
136124
builddeps: &build_pygithub
@@ -277,18 +265,3 @@ stretch: &stretch
277265
buster: *stretch
278266
bullseye: *stretch
279267
bookworm: *stretch
280-
centos-7:
281-
publish-rpm:
282-
build_dir: *build_dir
283-
builddeps: &el7_builddeps
284-
- https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
285-
pre-cache:
286-
- yum install -y fakeroot
287-
- yum upgrade -y binutils-2.27-44.base.el7.x86_64
288-
- wget https://go.dev/dl/go1.18.6.linux-amd64.tar.gz -P /tmp/
289-
- tar -C /usr/local -xzf /tmp/go1.18.6.linux-amd64.tar.gz
290-
post-cache:
291-
- export PATH=$PATH:/usr/local/go/bin
292-
- export GOOS=linux
293-
- export GOARCH=amd64
294-
- make publish-rpm

0 commit comments

Comments
 (0)