curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AUTH-1235: fixed packaging of deb dev file

This commit is contained in:
Austin Cherry 2018-10-19 14:01:08 -05:00
parent fa92441415
commit 72412db4c2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -16,6 +16,10 @@ ifeq ($(EQUINOX_IS_DRAFT), true)
EQUINOX_FLAGS := --draft $(EQUINOX_FLAGS) EQUINOX_FLAGS := --draft $(EQUINOX_FLAGS)
endif endif
ifeq ($(GOARCH),)
GOARCH := amd64
endif
.PHONY: all .PHONY: all
all: cloudflared test all: cloudflared test
@ -32,7 +36,7 @@ cloudflared-deb: cloudflared
mkdir -p $(PACKAGE_DIR) mkdir -p $(PACKAGE_DIR)
cp cloudflared $(PACKAGE_DIR)/cloudflared cp cloudflared $(PACKAGE_DIR)/cloudflared
fakeroot fpm -C $(PACKAGE_DIR) -s dir -t deb --deb-compression bzip2 \ fakeroot fpm -C $(PACKAGE_DIR) -s dir -t deb --deb-compression bzip2 \
-a $(GOARCH) -v $(VERSION) -n cloudflared -a $(GOARCH) -v $(VERSION) -n cloudflared cloudflared=/usr/local/bin/
.PHONY: cloudflared-darwin-amd64.tgz .PHONY: cloudflared-darwin-amd64.tgz
cloudflared-darwin-amd64.tgz: cloudflared cloudflared-darwin-amd64.tgz: cloudflared

4
cfsetup.yaml
View File

@ -1,6 +1,6 @@
pinned_go: &pinned_go go=1.9.3-1 pinned_go: &pinned_go go=1.9.3-1
build_dir: &build_dir /cfsetup_build/src/github.com/cloudflare/cloudflared/ build_dir: &build_dir /cfsetup_build/src/github.com/cloudflare/cloudflared/
stretch: stretch: &stretch
build: build:
build_dir: *build_dir build_dir: *build_dir
builddeps: builddeps:
@ -87,3 +87,5 @@ stretch:
- export GOOS=linux - export GOOS=linux
- export GOARCH=amd64 - export GOARCH=amd64
- make test - make test
jessie: *stretch