Compare commits

...

18 Commits

Author SHA1 Message Date
2d5d81b9d6 fix...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 19:53:53 +03:00
a503e9d45f better automation...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 19:49:27 +03:00
9b8f0ec4c6 some tooling...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 19:35:22 +03:00
7327ffa19a cleanup...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 19:18:08 +03:00
ce87a1a48e removed zipnote dependency...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 19:09:04 +03:00
bf3faba50c zipnote fails under windows -- have a hunch of the reason, if it is correct I'll have to walk away for a bit ;)
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 18:15:56 +03:00
b2c51bda01 tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 18:07:40 +03:00
39cb6d1a9c tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 17:59:26 +03:00
d1a2c902bf tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 17:51:07 +03:00
5af64caa08 tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 17:46:23 +03:00
aeca88b1c5 tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 16:07:30 +03:00
910a5eb929 tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 16:04:58 +03:00
8442a9ef4f tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 16:02:30 +03:00
66b75a9eae tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 16:01:24 +03:00
cfe2ca04d8 tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 15:58:33 +03:00
17529b543b tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 15:56:05 +03:00
9066a9d11c tweaking...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 15:48:14 +03:00
24a7c2ecf8 testing...
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
2025-10-16 15:20:29 +03:00
2 changed files with 35 additions and 20 deletions

View File

@ -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

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
@ -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" "$@"