From 60d6a919776166b5ad58cb0e33499246533425cc Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Thu, 13 Jun 2019 20:57:42 -0700 Subject: [PATCH] fix ruby version in new linux build fix rvm try 1.9.2? install rvm newer ruby? --- integrations/inputunifi/.travis.yml | 5 +++-- integrations/inputunifi/Makefile | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/integrations/inputunifi/.travis.yml b/integrations/inputunifi/.travis.yml index 4ae0bb79..7a8d8f5a 100644 --- a/integrations/inputunifi/.travis.yml +++ b/integrations/inputunifi/.travis.yml @@ -18,11 +18,12 @@ before_install: # download super-linter: golangci-lint - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin latest #- curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin latest +- rvm install 2.0.0 install: - dep ensure -- rvm $brew_ruby do gem install --no-document fpm +- rvm 2.0.0 do gem install --no-document fpm script: -- rvm $brew_ruby do make release +- rvm 2.0.0 do make release # get deploy key for golift/homebrew-mugs. after_success: - | diff --git a/integrations/inputunifi/Makefile b/integrations/inputunifi/Makefile index 99f44221..c28989d9 100644 --- a/integrations/inputunifi/Makefile +++ b/integrations/inputunifi/Makefile @@ -20,13 +20,13 @@ RPMVERSION:=$(shell echo $(VERSION) | tr -- - _) all: man build # Prepare a release. Called in Travis CI. -release: clean test $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)-$(VERSION).pkg +release: clean test $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb macos # Prepareing a release! mkdir -p release gzip -9 $(BINARY).linux gzip -9 $(BINARY).macos mv $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb \ - $(BINARY)-$(VERSION).pkg $(BINARY).macos.gz $(BINARY).linux.gz release/ + $(BINARY).macos.gz $(BINARY).linux.gz release/ # Generating File Hashes openssl dgst -sha256 release/* | tee release/$(BINARY)_checksums_$(VERSION)-$(ITERATION).txt @@ -34,7 +34,7 @@ release: clean test $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)_$( clean: # Cleaning up. rm -f $(BINARY){.macos,.linux,.1,}{,.gz} $(BINARY).rb - rm -f $(BINARY){_,-}*.{deb,rpm,pkg} md2roff v*.tar.gz.sha256 + rm -f $(BINARY){_,-}*.{deb,rpm} md2roff v*.tar.gz.sha256 rm -f cmd/$(BINARY)/README{,.html} README{,.html} ./$(BINARY)_manual.html rm -rf package_build_* release