yuanzhe1999/windows95
1
0
Fork 0
mirror of https://github.com/felixrieseberg/windows95.git synced 2026-05-09 00:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use cwd-relative path in @electron/packager resedit patch

Browse Source 
The patch hardcoded a local Windows path, breaking Windows CI builds. Now resolves tools/resedit.js relative to process.cwd() and uses process.execPath instead of 'node'. Also drops the deb maker diagnostic step now that Linux builds pass.
This commit is contained in:
Felix Rieseberg
2026-04-12 16:56:20 -07:00
parent e1c30f701c
commit fb701041c2
2 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build.yml vendored
View File

@@ -79,13 +79,6 @@ jobs:
DISK_URL: ${{ secrets.DISK_URL }} DISK_URL: ${{ secrets.DISK_URL }}
- name: Install - name: Install
run: npm ci run: npm ci
- name: Diagnose deb maker
if: matrix.os == 'ubuntu-latest'
run: |
node -e "const r=require('module').createRequire(require.resolve('@electron-forge/maker-base/package.json'));try{r('electron-installer-debian');console.log('OK from maker-base')}catch(e){console.error('FAIL from maker-base:',e)}"
node -e "const {MakerDeb}=require('@electron-forge/maker-deb');const m=new MakerDeb({});console.log('isSupported:',m.isSupportedOnCurrentPlatform());try{m.ensureExternalBinariesExist();console.log('binaries OK')}catch(e){console.error('binaries:',e.message)}"
ls -la node_modules/electron-installer-debian/ || echo "NOT INSTALLED"
which dpkg fakeroot || echo "missing binaries"
- name: Make - name: Make
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
run: npm run make -- --arch=${{ matrix.arch }} run: npm run make -- --arch=${{ matrix.arch }}

4
patches/@electron+packager+18.4.4.patch
View File

@@ -13,8 +13,8 @@ index d318f6c..bfde740 100644
+ // await (0, resedit_1.resedit)(this.electronBinaryPath, resOpts); + // await (0, resedit_1.resedit)(this.electronBinaryPath, resOpts);
+ +
+ const { spawnSync } = require('child_process'); + const { spawnSync } = require('child_process');
+ const resEditProcess = spawnSync('node', [ + const resEditProcess = spawnSync(process.execPath, [
+ 'C:\\Users\\FelixRieseberg\\Code\\windows95\\tools\\resedit.js', + require('path').resolve(process.cwd(), 'tools', 'resedit.js'),
+ this.electronBinaryPath + this.electronBinaryPath
+ ], { + ], {
+ stdio: 'inherit' + stdio: 'inherit'