mirror of
https://github.com/flynx/ImageGrid.git
synced 2025-10-28 18:00:09 +00:00
Compare commits
18 Commits
96d544e314
...
2d5d81b9d6
| Author | SHA1 | Date | |
|---|---|---|---|
| 2d5d81b9d6 | |||
| a503e9d45f | |||
| 9b8f0ec4c6 | |||
| 7327ffa19a | |||
| ce87a1a48e | |||
| bf3faba50c | |||
| b2c51bda01 | |||
| 39cb6d1a9c | |||
| d1a2c902bf | |||
| 5af64caa08 | |||
| aeca88b1c5 | |||
| 910a5eb929 | |||
| 8442a9ef4f | |||
| 66b75a9eae | |||
| cfe2ca04d8 | |||
| 17529b543b | |||
| 9066a9d11c | |||
| 24a7c2ecf8 |
10
.github/workflows/viewer-build.yml
vendored
10
.github/workflows/viewer-build.yml
vendored
@ -29,17 +29,19 @@ jobs:
|
|||||||
|
|
||||||
- uses: actions/setup-node@v6
|
- uses: actions/setup-node@v6
|
||||||
|
|
||||||
- if: ${{ matrix.os == 'windows-latest' }}
|
- name: Windows-specific
|
||||||
|
if: ${{ matrix.os == 'windows-latest' }}
|
||||||
run: |
|
run: |
|
||||||
choco install wget zip
|
choco install wget zip
|
||||||
|
|
||||||
- if: ${{ matrix.os == 'ubuntu-latest' }}
|
- name: Ubuntu-specific
|
||||||
|
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
run: |
|
run: |
|
||||||
# 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
|
#- name: MacOS-specific
|
||||||
run: make check
|
# if: ${{ matrix.os == 'macos-latest' }}
|
||||||
|
|
||||||
- name: Pre-Build
|
- name: Pre-Build
|
||||||
run: make clean-all dev
|
run: make clean-all dev
|
||||||
|
|||||||
@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -559,6 +561,14 @@ run: electron-run
|
|||||||
install: dev
|
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...
|
### Cleanup...
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
@ -913,18 +923,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 "$@.tmp" \
|
unzip -p "$@.tmp" LICENSE > $(BUILD_DIR)/LICENSE.electron
|
||||||
| sed 's/\(^@ LICENSE\)$$/\1\n@=LICENSE.electron/' \
|
# rename app...
|
||||||
| zipnote -w "$@.tmp"
|
# # 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)"}
|
||||||
# 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)")
|
$(call zipFrom,"$(BUILD_DIR)",$@.tmp,\
|
||||||
# rename app...
|
"$(ASAR_PATH)" \
|
||||||
# # XXX also rename MacOS/Electron -> $(APP_NAME) -- this needs Info.plist changes...
|
"$(notdir $(BUILD_INFO))" \
|
||||||
zipnote "$@.tmp" \
|
"$(LICENSE)" \
|
||||||
| sed 's/\(^@ $(ELECTRON_BIN)$(EXT)\)\(.*$$\)/\1\2\n@=$(APP_BIN)$(EXT)\2/' \
|
"$(LICENSE).electron" \
|
||||||
| zipnote -w "$@.tmp"
|
"$(APP_BIN)$(EXT)")
|
||||||
# cleanup...
|
# cleanup...
|
||||||
$(RM) $(BUILD_DIR)/$(firstword $(subst /, ,$(ASAR_PATH)))
|
$(RM) $(BUILD_DIR)/$(firstword $(subst /, ,$(ASAR_PATH)))
|
||||||
mv "$@.tmp" "$@"
|
mv "$@.tmp" "$@"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user