[ARVADOS-WORKBENCH2] updated: 1.1.4-111-g8dc6f80

[Git user]

Summary of changes:
 Makefile | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

       via  8dc6f80d8dc2365248093ae7c402491d4614d7f4 (commit)
      from  a01f29eb2238fbab8c87254ab23bbc82107832be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8dc6f80d8dc2365248093ae7c402491d4614d7f4
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Tue Jun 19 20:32:46 2018 -0400

    A few Makefile changes for the CI build pipeline.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/Makefile b/Makefile
index a543d46..30ab7bc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+# Use bash, and run all lines in each recipe as one shell command
+SHELL := /bin/bash
+.ONESHELL:
+
 APP_NAME?=arvados-workbench2
 
 # GIT_TAG is the last tagged stable release (i.e. 1.2.0)
@@ -34,7 +38,7 @@ DEST_DIR=/var/www/arvados-workbench2/workbench2/
 DEB_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION)_amd64.deb
 
 # redHat package file
-RPM_FILE=$(APP_NAME)_$(VERSION)-$(ITERATION).x86_64.rpm
+RPM_FILE=$(APP_NAME)-$(VERSION)-$(ITERATION).x86_64.rpm
 
 export WORKSPACE?=$(shell pwd)
 
@@ -94,5 +98,16 @@ $(RPM_FILE): build
 	 --description="$(DESCRIPTION)" \
 	 $(WORKSPACE)/build/=$(DEST_DIR)
 
+copy: $(DEB_FILE) $(RPM_FILE)
+	for target in $(TARGETS); do \
+		if [[ $$target =~ ^centos ]]; then
+			cp -p $(RPM_FILE) packages/$$target ; \
+		else
+			cp -p $(DEB_FILE) packages/$$target ; \
+		fi
+	done
+	rm -f $(RPM_FILE)
+	rm -f $(DEB_FILE)
+
 # use FPM to create DEB and RPM
-packages: $(DEB_FILE) $(RPM_FILE)
+packages: copy

-----------------------------------------------------------------------


hooks/post-receive
--