From f529684277bbb7e6a4ce2039f5528ba9aa443ff0 Mon Sep 17 00:00:00 2001 From: Greg Szabo Date: Tue, 11 Jul 2017 17:48:30 +0000 Subject: [PATCH] Build workarounds were fixed for trackomatron and gaia. --- devops/rpmbuild/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devops/rpmbuild/Makefile b/devops/rpmbuild/Makefile index 648d5393..23493343 100644 --- a/devops/rpmbuild/Makefile +++ b/devops/rpmbuild/Makefile @@ -78,7 +78,7 @@ build-ethermint: git-branch build-trackomatron: git-branch @echo "*** Building trackomatron" - go get -d -u go github.com/tendermint/trackomatron || echo "Workaround so there is no error message." + go get -d -u go github.com/tendermint/trackomatron/cmd/tracko cd $(GOPATH)/src/github.com/tendermint/trackomatron && git checkout "$(GIT_BRANCH)" && git pull $(MAKE) -C $(GOPATH)/src/github.com/tendermint/trackomatron get_vendor_deps install @echo "Workaround: trackomatron package has tracko as the binary - trackomatron needed to get the version number" && rm -rf $(GOPATH)/bin/trackomatron && ln -s $(GOPATH)/bin/tracko $(GOPATH)/bin/trackomatron @@ -86,7 +86,7 @@ build-trackomatron: git-branch build-gaia: git-branch @echo "*** Building gaia" - go get -d -u go github.com/cosmos/gaia || echo "Workaround so there is no error message." + go get -d -u go github.com/cosmos/gaia cd $(GOPATH)/src/github.com/cosmos/gaia && git checkout "$(GIT_BRANCH)" && git pull $(MAKE) -C $(GOPATH)/src/github.com/cosmos/gaia get_vendor_deps install @echo "*** Built gaia" @@ -103,6 +103,7 @@ prepare-spec-%: version-% package-rpm-%: prepare-spec-% @echo "*** Packaging RPM $* version $($*_version)" + script rpmbuild -bb SPECS/$*.spec ./sign RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm rpm -Kv RPMS/x86_64/$*-$($*_version)-$(BUILD_NUMBER).x86_64.rpm