From 72412db4c29245a5fab84c9143325d6c4cd9b899 Mon Sep 17 00:00:00 2001 From: Austin Cherry Date: Fri, 19 Oct 2018 14:01:08 -0500 Subject: [PATCH] AUTH-1235: fixed packaging of deb dev file --- Makefile | 6 +++++- cfsetup.yaml | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 17f50f01..ee1b3101 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,10 @@ ifeq ($(EQUINOX_IS_DRAFT), true) EQUINOX_FLAGS := --draft $(EQUINOX_FLAGS) endif +ifeq ($(GOARCH),) + GOARCH := amd64 +endif + .PHONY: all all: cloudflared test @@ -32,7 +36,7 @@ cloudflared-deb: cloudflared mkdir -p $(PACKAGE_DIR) cp cloudflared $(PACKAGE_DIR)/cloudflared 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 cloudflared-darwin-amd64.tgz: cloudflared diff --git a/cfsetup.yaml b/cfsetup.yaml index de5e0b72..d64e0679 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -1,6 +1,6 @@ pinned_go: &pinned_go go=1.9.3-1 build_dir: &build_dir /cfsetup_build/src/github.com/cloudflare/cloudflared/ -stretch: +stretch: &stretch build: build_dir: *build_dir builddeps: @@ -87,3 +87,5 @@ stretch: - export GOOS=linux - export GOARCH=amd64 - make test + +jessie: *stretch \ No newline at end of file