diff --git a/.travis.yml b/.travis.yml index 58164909c9917f5cc75642656f3953f8d13de546..d97b169cebff3f9d66d7317bb8931e69cb2d0f9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,8 @@ addons: apt: packages: - rpm + - createrepo + - dpkg-sig go: - '1.4' env: @@ -18,7 +20,6 @@ before_deploy: - make toolchain - make build - make package -- '[[ -z "$TRAVIS_TAG" ]] || make packagecloud' deploy: - provider: releases api_key: diff --git a/Makefile b/Makefile index 10a6be16ae10b9c589186cf1855c6b5268350a75..9c05637e8288383446c3489400ca015fb052e4d8 100644 --- a/Makefile +++ b/Makefile @@ -69,15 +69,31 @@ package-deb: # Building Debian compatible packages... make package-deb-fpm ARCH=amd64 make package-deb-fpm ARCH=386 + # Building Debian compatible repository... + rm -f out/deb/{InRelease,Release.gpg} + cd out/deb && apt-ftparchive packages . > Packages + cd out/deb && apt-ftparchive release . > Release + gzip out/deb/Packages > Packages.gz +ifneq (,$(GPG_KEY)) + gpg --clearsign -o out/deb/{InRelease,Release} + gpg -abs -o out/deb/{Release.gpg,Release} +endif package-rpm: # Building RedHat compatible packages... make package-rpm-fpm ARCH=amd64 + make package-rpm-fpm ARCH=i386 + createrepo out/rpm package-deps: # Installing packaging dependencies... gem install fpm +ifneq (,$(GPG_KEY)) + # Importing GPG key + @echo "$(GPG_KEY)" | base64 -d | gpg --allow-secret-key-import --import - +endif + package-deb-fpm: @mkdir -p out/deb/ fpm -s dir -t deb -n $(NAME) -v $(VERSION) \ @@ -94,6 +110,9 @@ package-deb-fpm: --vendor "ayufan.eu" \ -a $(ARCH) \ out/binaries/gitlab-ci-multi-runner-linux-$(ARCH)=/usr/bin/gitlab-ci-multi-runner +ifneq (,$(GPG_KEY)) + dpkg-sig --sign builder out/deb/$(NAME)_$(ARCH).deb +endif package-rpm-fpm: @mkdir -p out/rpm/ @@ -108,6 +127,9 @@ package-rpm-fpm: -m "Kamil TrzciĆski <ayufan@ayufan.eu>" \ --license "MIT" \ --vendor "ayufan.eu" \ +ifneq (,$(GPG_KEY)) + --rpm-sign \ +endif -a $(ARCH) \ out/binaries/gitlab-ci-multi-runner-linux-$(ARCH)=/usr/bin/gitlab-ci-multi-runner diff --git a/commands/version.go b/commands/version.go index d7e31981c086241269e8c60daa90aacfab9e27b3..2e7edc6b2f1e943c6a4bfdb4120572dadc226f0c 100644 --- a/commands/version.go +++ b/commands/version.go @@ -1,3 +1,4 @@ package commands -const VERSION = "dev" +const VERSION = "0.1.17-4-g0e50b6e (0e50b6e)" +const REVISION = "0e50b6e"