flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-10-28 18:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2025-10-16 19:18:08 +03:00
parent ce87a1a48e
commit 7327ffa19a
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/viewer-build.yml vendored
View File

@ -15,8 +15,7 @@ jobs:
strategy: strategy:
matrix: matrix:
#os: [ ubuntu-latest, windows-latest, macos-latest ] #os: [ ubuntu-latest, windows-latest, macos-latest ]
#os: [ ubuntu-latest, windows-latest ] os: [ ubuntu-latest, windows-latest ]
os: [ windows-latest ]
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
@ -41,23 +40,12 @@ jobs:
# fixes an issue when running npx sandboxing... # fixes an issue when running npx sandboxing...
sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0 sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
#- name: Check build dependencies
# run: make check
- name: Pre-Build - name: Pre-Build
run: make clean-all dev run: make clean-all dev
- name: Build - name: Build
run: make dist run: make dist
- name: Check build
if: always()
run: |
ls -la ./build
echo "---"
# XXX this fails for some reason...
#zipnote -w ./build/Im*.zip.tmp <<<$'@ LICENSE\n@=LICENSE.electron'
- name: Release - name: Release
env: env:
GH_TOKEN: ${{ github.token }} GH_TOKEN: ${{ github.token }}

26
Viewer/Makefile
View File

@ -15,12 +15,14 @@
# also nodejs-legacy seems to be required in some # also nodejs-legacy seems to be required in some
# contexts... # contexts...
# - wget # - wget
# - zip / unzip / zipnote # - zip / unzip
# if zipnote fails this is likely due to a bug in # NOTE: since zipnote fails in some cases it is
# v3.0, to fix this by either upgrading to 3.1 or # removed from dependencies.
# a patched version of 3.0... # this behavior s is likely due to a bug in
# for more info and patch see: # v3.0, to fix this by either upgrading to
# https://goo.gl/csQmQo # 3.1 or a patched version of 3.0...
# for more info and patch see:
# https://goo.gl/csQmQo
# - Optional # - Optional
# - npm i -g electron electron-rebuild asar less # - npm i -g electron electron-rebuild asar less
# needed only if running global versions of cli's, # needed only if running global versions of cli's,
@ -405,7 +407,7 @@ DEPENDENCIES_WEB = node npm npx
DEPENDENCIES = $(DEPENDENCIES_WEB) \ DEPENDENCIES = $(DEPENDENCIES_WEB) \
$(DEPENDENCIES_HELP) \ $(DEPENDENCIES_HELP) \
wget zip unzip zipnote git wget zip unzip git
@ -913,19 +915,21 @@ $(BUILD_DIR)/$(APP_NAME)-%.in-place.zip: $(TARGET_DIR)/$(ELECTRON_DIST) \
# rename electron stuff... # rename electron stuff...
# # XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes... # # XXX rename "Electron Helper" on mac builds -- this needs Info.plist changes...
# | sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/' # | sed 's/\(^@ \(.*\)Electron Helper\(.*\)\)$$/\1\n@=\2$(APP_NAME) Helper\3/'
#zipnote -w "$@.tmp" <<<$$'@ LICENSE\n@=LICENSE.electron'
unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron
# rename app... # rename app...
# # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes... # # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes...
# # XXX zipnote seems to not be working on github actions' windows
#zipnote -w "$@.tmp" <<<$$'@ $(ELECTRON_BIN)$(EXT)\n@=$(APP_BIN)$(EXT)'
unzip -d $(BUILD_DIR) "$@.tmp" "$(ELECTRON_BIN)$(EXT)" unzip -d $(BUILD_DIR) "$@.tmp" "$(ELECTRON_BIN)$(EXT)"
zip -d "$@.tmp" "$(ELECTRON_BIN)$(EXT)" zip -d "$@.tmp" "$(ELECTRON_BIN)$(EXT)"
mv "${BUILD_DIR}"/{"$(ELECTRON_BIN)$(EXT)","$(APP_BIN)$(EXT)"} mv "${BUILD_DIR}"/{"$(ELECTRON_BIN)$(EXT)","$(APP_BIN)$(EXT)"}
# add app.asar and friends... # add app.asar and friends...
$(MD) "$(BUILD_DIR)/$(ASAR_PATH)" $(MD) "$(BUILD_DIR)/$(ASAR_PATH)"
cp -r $(BUILD_DIR)/app.asar* "$(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)" \
"$(LICENSE).electron" \
"$(APP_BIN)$(EXT)")
# cleanup... # cleanup...
$(RM) $(BUILD_DIR)/$(firstword $(subst /, ,$(ASAR_PATH))) $(RM) $(BUILD_DIR)/$(firstword $(subst /, ,$(ASAR_PATH)))
mv "$@.tmp" "$@" mv "$@.tmp" "$@"