Merge pull request #1329 from smallstep/carl/make-clean

Clean up Makefile and fix goreleaser deprecation

.goreleaser.yml

@@ -36,6 +36,7 @@ archives:
     # Most common use case is to archive as zip on Windows.
     # Default is empty.
     name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Version }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}{{ if .Mips }}_{{ .Mips }}{{ end }}"
+    rlcp: true
     format_overrides:
       - goos: windows
         format: zip
@@ -78,6 +79,7 @@ nfpms:
 
 source:
   enabled: true
+  rlcp: true
   name_template: '{{ .ProjectName }}_{{ .Version }}'
 
 checksum:

Makefile

@@ -6,8 +6,6 @@ Q=$(if $V,,@)
 PREFIX?=
 SRC=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
 GOOS_OVERRIDE ?=
-OUTPUT_ROOT=output/
-RELEASE=./.releases
 
 all: lint test build
 
@@ -23,6 +21,8 @@ bootstra%:
 	$Q curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin latest
 	$Q go install golang.org/x/vuln/cmd/govulncheck@latest
 	$Q go install gotest.tools/gotestsum@latest
+	$Q go install github.com/goreleaser/goreleaser@latest
+	$Q go install github.com/sigstore/cosign/v2/cmd/cosign@latest
 
 .PHONY: bootstra%
 
@@ -30,17 +30,8 @@ bootstra%:
 # Determine the type of `push` and `version`
 #################################################
 
-# If TRAVIS_TAG is set then we know this ref has been tagged.
-ifdef TRAVIS_TAG
-VERSION ?= $(TRAVIS_TAG)
-NOT_RC  := $(shell echo $(VERSION) | grep -v -e -rc)
-	ifeq ($(NOT_RC),)
-PUSHTYPE := release-candidate
-	else
-PUSHTYPE := release
-	endif
 # GITHUB Actions
-else ifdef GITHUB_REF
+ifdef GITHUB_REF
 VERSION ?= $(shell echo $(GITHUB_REF) | sed 's/^refs\/tags\///')
 NOT_RC  := $(shell echo $(VERSION) | grep -v -e -rc)
 	ifeq ($(NOT_RC),)
@@ -53,21 +44,14 @@ VERSION ?= $(shell [ -d .git ] && git describe --tags --always --dirty="-dev")
 # If we are not in an active git dir then try reading the version from .VERSION.
 # .VERSION contains a slug populated by `git archive`.
 VERSION := $(or $(VERSION),$(shell ./.version.sh .VERSION))
-	ifeq ($(TRAVIS_BRANCH),master)
-PUSHTYPE := master
-	else
 PUSHTYPE := branch
-	endif
 endif
 
 VERSION := $(shell echo $(VERSION) | sed 's/^v//')
-DEB_VERSION := $(shell echo $(VERSION) | sed 's/-/./g')
 
 ifdef V
-$(info    TRAVIS_TAG is $(TRAVIS_TAG))
 $(info    GITHUB_REF is $(GITHUB_REF))
 $(info    VERSION is $(VERSION))
-$(info    DEB_VERSION is $(DEB_VERSION))
 $(info    PUSHTYPE is $(PUSHTYPE))
 endif
 
@@ -169,23 +153,3 @@ run:
 
 .PHONY: run
 
-#########################################
-# Debian
-#########################################
-
-changelog:
-	$Q echo "step-ca ($(DEB_VERSION)) unstable; urgency=medium" > debian/changelog
-	$Q echo >> debian/changelog
-	$Q echo "  * See https://github.com/smallstep/certificates/releases" >> debian/changelog
-	$Q echo >> debian/changelog
-	$Q echo " -- Smallstep Labs, Inc. <techadmin@smallstep.com>  $(shell date -uR)" >> debian/changelog
-
-debian: changelog
-	$Q mkdir -p $(RELEASE); \
-	OUTPUT=../step-ca*.deb; \
-	rm $$OUTPUT; \
-	dpkg-buildpackage -b -rfakeroot -us -uc && cp $$OUTPUT $(RELEASE)/
-
-distclean: clean
-
-.PHONY: changelog debian distclean

debian/changelog

@@ -1,5 +0,0 @@
-step-ca (0.8.4-14-ge72f087-dev) unstable; urgency=medium
-
-  * See https://github.com/smallstep/certificates/releases
-
- -- Smallstep Labs, Inc. <techadmin@smallstep.com>  Wed, 20 Feb 2019 20:44:25 +0000

debian/compat

@@ -1 +0,0 @@
-10

debian/control

@@ -1,15 +0,0 @@
-Source: step-ca
-Section: utils
-Priority: optional
-Maintainer: Smallstep Labs, Inc. <techadmin@smallstep.com>
-Build-Depends: debhelper (>= 9), git, bash-completion
-Standards-Version: 4.2.0
-Homepage: https://github.com/smallstep/certificates
-Vcs-Browser: https://github.com/smallstep/certificates.git
-Vcs-Git: https://github.com/smallstep/certificates.git
-
-Package: step-ca
-Architecture: any
-Depends: ${misc:Depends}
-Description: Smallstep Certificate Authority
-   step-ca is the Smallstep Certificate Authority.

debian/rules

@@ -1,13 +0,0 @@
-#!/usr/bin/make -f
-
-override_dh_install-arch:
-	dh_install --arch
-
-build:
-	dh build
-
-override_dh_auto_build:
-	dh_auto_build -- build
-
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)