[arvados-workbench2] created: 2.6.3-98-ga54b7454

git repository hosting git at public.arvados.org
Thu Aug 24 19:41:46 UTC 2023


        at  a54b7454b45a08aae06cdf66082c69ae63bd8dc4 (commit)


commit a54b7454b45a08aae06cdf66082c69ae63bd8dc4
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Aug 24 15:41:16 2023 -0400

    20884: Update Makefile copy rule to accommodate rocky8
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/Makefile b/Makefile
index 0c618fd0..2ca5e79a 100644
--- a/Makefile
+++ b/Makefile
@@ -125,16 +125,15 @@ $(RPM_FILE): build
 	etc/arvados/workbench2/workbench2.example.json=/etc/arvados/$(APP_NAME)/workbench2.example.json
 
 copy: $(DEB_FILE) $(RPM_FILE)
-	for target in $(TARGETS) ; do \
-	        mkdir -p packages/$$target
-		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)
+	for target in $(TARGETS); do \
+		mkdir -p "packages/$$target" && \
+		case "$$target" in \
+			centos*|rocky*) cp -p "$(RPM_FILE)" "packages/$$target" ;; \
+			debian*|ubuntu*) cp -p "$(DEB_FILE)" "packages/$$target" ;; \
+			*) echo "Unknown copy target $$target"; exit 1 ;; \
+		esac ; \
+	done ; \
+	rm -f "$(DEB_FILE)" "$(RPM_FILE)"
 
 # use FPM to create DEB and RPM
 packages: copy

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list