diff --git a/Makefile b/Makefile index c73cce51..ccd9a5fb 100644 --- a/Makefile +++ b/Makefile @@ -51,8 +51,6 @@ 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 3fd44e20..f95c3088 100644 --- a/cfsetup.yaml +++ b/cfsetup.yaml @@ -181,36 +181,6 @@ 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