.github/workflows/viewer-build.yml

@@ -29,19 +29,17 @@ jobs:
 
     - uses: actions/setup-node@v6
 
-    - name: Windows-specific
-      if: ${{ matrix.os == 'windows-latest' }}
+    - if: ${{ matrix.os == 'windows-latest' }}
       run: |
         choco install wget zip
 
-    - name: Ubuntu-specific
-      if: ${{ matrix.os == 'ubuntu-latest' }}
+    - if: ${{ matrix.os == 'ubuntu-latest' }}
       run: |
         # fixes an issue when running npx sandboxing...
         sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
 
-    #- name: MacOS-specific
-    #  if: ${{ matrix.os == 'macos-latest' }}
+    - name: Check build dependencies
+      run: make check
 
     - name: Pre-Build
       run: make clean-all dev

Viewer/Makefile

@@ -15,14 +15,12 @@
 # 			also nodejs-legacy seems to be required in some 
 # 			contexts...
 # 		- wget
-# 		- zip / unzip
-# 			NOTE: since  zipnote fails in some cases it is 
-# 				removed from dependencies.
-# 				this behavior s is likely due to a bug in 
-# 				v3.0, to fix this by either upgrading to 
-# 				3.1 or a patched version of 3.0...
-# 				for more info and patch see: 
-# 					https://goo.gl/csQmQo
+# 		- zip / unzip / zipnote
+# 			if zipnote fails this is likely due to a bug in 
+# 			v3.0, to fix this by either upgrading to 3.1 or 
+# 			a patched version of 3.0...
+# 			for more info and patch see: 
+# 				https://goo.gl/csQmQo
 # 	- Optional
 # 		- npm i -g electron electron-rebuild asar less 
 # 			needed only if running global versions of cli's,
@@ -407,7 +405,7 @@ DEPENDENCIES_WEB = node npm npx
 
 DEPENDENCIES = $(DEPENDENCIES_WEB) \
 	$(DEPENDENCIES_HELP) \
-	wget zip unzip git
+	wget zip unzip zipnote git
 
 
 
@@ -561,14 +559,6 @@ run: electron-run
 install: dev
 
 
-# XXX STUB: move the builds to specific release tags... 
-.PHONY: update-release-tag
-update-release-tag: ## Move release-latest tag to HEAD
-	git push origin :refs/tags/release-latest
-	git tag -fam "TEST" release-latest
-	git push origin --tags
-
-
 ### Cleanup...
 
 .PHONY: clean
@@ -923,21 +913,18 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \
 	# rename electron stuff...
 #	# XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes...
 #		| sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' 
-	unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron
-	# rename app...
-#	# XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes...
-	unzip -d $(BUILD_DIR) "$@.tmp" "$(ELECTRON_BIN)$(EXT)"
-	zip -d "$@.tmp" "$(ELECTRON_BIN)$(EXT)"
-	mv "${BUILD_DIR}"/{"$(ELECTRON_BIN)$(EXT)","$(APP_BIN)$(EXT)"}
+	zipnote "$@.tmp" \
+		| sed 's/\(^@ LICENSE\)$$/\1\n@=LICENSE.electron/' \
+		| zipnote -w "$@.tmp"
 	# add app.asar and friends...
 	$(MD) "$(BUILD_DIR)/$(ASAR_PATH)"
 	cp -r $(BUILD_DIR)/app.asar* "$(BUILD_DIR)/$(ASAR_PATH)/"
-	$(call zipFrom,"$(BUILD_DIR)",$@.tmp,\
-		"$(ASAR_PATH)" \
-		"$(notdir $(BUILD_INFO))" \
-		"$(LICENSE)" \
-		"$(LICENSE).electron" \
-		"$(APP_BIN)$(EXT)")
+	$(call zipFrom,"$(BUILD_DIR)",$@.tmp,"$(ASAR_PATH)" "$(notdir $(BUILD_INFO))" "$(LICENSE)")
+	# rename app...
+#	# XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes...
+	zipnote "$@.tmp" \
+		| sed 's/\(^@ $(ELECTRON_BIN)$(EXT)\)\(.*$$\)/\1\2\n@=$(APP_BIN)$(EXT)\2/' \
+		| zipnote -w "$@.tmp"
 	# cleanup...
 	$(RM) $(BUILD_DIR)/$(firstword $(subst /, ,$(ASAR_PATH)))
 	mv "$@.tmp" "$@"