From a42b66e8bd4bd93bafa9f1ba918b3b78472a096e Mon Sep 17 00:00:00 2001 From: Michael Borkenstein Date: Thu, 9 Jul 2020 10:57:19 -0500 Subject: [PATCH] AUTH-2872: Adds centos-6 build --- Makefile | 2 ++ cfsetup.yaml | 43 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 62e1a251..d430139d 100644 --- a/Makefile +++ b/Makefile @@ -51,6 +51,8 @@ endif ifeq ($(FLAVOR), centos-7) TARGET_PUBLIC_REPO ?= el7 +else ifeq ($(FLAVOR), centos-6) + TARGET_PUBLIC_REPO ?= el6 else TARGET_PUBLIC_REPO ?= $(FLAVOR) endif diff --git a/cfsetup.yaml b/cfsetup.yaml index 7ddf372d..ff872239 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -170,10 +170,40 @@ jessie: *stretch buster: *stretch +centos-6: + build-rpm: + build_dir: *build_dir + builddeps: &el6_builddeps + - https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm + post-cache: + - source /usr/local/rvm/scripts/rvm + - rvm use 1.9 + - sudo yum install -y fakeroot + - wget https://golang.org/dl/go1.12.9.linux-amd64.tar.gz -P /tmp/ + - sudo tar -C /usr/local -xzf /tmp/go1.12.9.linux-amd64.tar.gz + - export PATH=$PATH:/usr/local/go/bin + - export GOOS=linux + - export GOARCH=amd64 + - make cloudflared-rpm + publish-rpm: + build_dir: *build_dir + builddeps: *el6_builddeps + post-cache: + - source /usr/local/rvm/scripts/rvm + - rvm use 1.9 + - sudo yum install -y fakeroot + - wget https://golang.org/dl/go1.12.9.linux-amd64.tar.gz -P /tmp/ + - sudo tar -C /usr/local -xzf /tmp/go1.12.9.linux-amd64.tar.gz + - export PATH=$PATH:/usr/local/go/bin + - export GOOS=linux + - export GOARCH=amd64 + - make publish-rpm + + centos-7: publish-rpm: build_dir: *build_dir - builddeps: + builddeps: &el7_builddeps - https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm post-cache: - sudo yum install -y fakeroot @@ -183,6 +213,17 @@ centos-7: - export GOOS=linux - export GOARCH=amd64 - make publish-rpm + build-rpm: + build_dir: *build_dir + builddeps: *el7_builddeps + post-cache: + - sudo yum install -y fakeroot + - wget https://golang.org/dl/go1.12.9.linux-amd64.tar.gz -P /tmp/ + - sudo tar -C /usr/local -xzf /tmp/go1.12.9.linux-amd64.tar.gz + - export PATH=$PATH:/usr/local/go/bin + - export GOOS=linux + - export GOARCH=amd64 + - make cloudflared-rpm # cfsetup compose default-stack: test_dbconnect