Skip to content

Commit

Permalink
fix: remove msi builder, to fix node-gyp failed to rebuild @bitdisast…
Browse files Browse the repository at this point in the history
…er/exe-icon-extractor
  • Loading branch information
linonetwo committed Jun 29, 2024
1 parent ca6677f commit fb04909
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 95 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ jobs:
- name: Install dependencies
run: pnpm install --no-frozen-lockfile

- name: Add msi to path
run: echo "${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
# - name: Add msi to path
# run: echo "${env:wix}bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
# Enable x32 if someone still need it
# - name: Make Windows (ia32)
# run: pnpm run make:win-ia32
Expand All @@ -238,10 +238,10 @@ jobs:
CI: true
CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Rename (x64)
run: |
Get-ChildItem out/make/wix/x64
Rename-Item -Path "out/make/wix/x64/TidGi.msi" -NewName "Install-TidGi-Windows-x64.msi"
# - name: Rename (x64)
# run: |
# Get-ChildItem out/make/wix/x64
# Rename-Item -Path "out/make/wix/x64/TidGi.msi" -NewName "Install-TidGi-Windows-x64.msi"
- name: Make Windows (arm64)
run: pnpm run make:win-arm
env:
Expand All @@ -250,20 +250,20 @@ jobs:
CI: true
CI_PULL_REQUEST: ${{ github.event_name == 'pull_request' }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Rename (arm64)
run: |
Get-ChildItem out/make/wix/arm64
Rename-Item -Path "out/make/wix/arm64/TidGi.msi" -NewName "Install-TidGi-Windows-arm64.msi"
# - name: Rename (arm64)
# run: |
# Get-ChildItem out/make/wix/arm64
# Rename-Item -Path "out/make/wix/arm64/TidGi.msi" -NewName "Install-TidGi-Windows-arm64.msi"

- name: Create Release
uses: softprops/action-gh-release@v1
if: startsWith(github.ref, 'refs/tags/')
with:
draft: true
generate_release_notes: true
# out/make/**/*.msi
files: |
out/make/**/*.exe
out/make/**/*.msi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
43 changes: 22 additions & 21 deletions forge.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,27 +46,28 @@ const config = {
};
},
},
{
name: '@electron-forge/maker-wix',
config: (arch) => {
return {
language: 1033,
manufacturer: 'tiddlywiki.org',
programFilesFolderName: 'TiddlyWiki',
shortcutFolderName: 'TiddlyWiki',
description,
exe: 'TidGi',
name: 'TidGi',
ui: {
chooseDirectory: true,
},
appIconPath: 'build-resources/icon.ico',
// WiX distributables do not handle prerelease information in the app version, removing it from the MSI (-prerelease3.4)
// and https://github.com/felixrieseberg/electron-wix-msi/issues/110 ask use to use fixed number
version: '1.0.0',
};
},
},
// ✖ Preparing native dependencies: 0 / 1 [FAILED: node-gyp failed to rebuild '/Users/runner/work/TidGi-Desktop/TidGi-Desktop/node_modules/.pnpm/@bitdisaster+exe-icon-extractor@1.0.10/node_modules/@bitdisaster/exe-icon-extractor']
// {
// name: '@electron-forge/maker-wix',
// config: (arch) => {
// return {
// language: 1033,
// manufacturer: 'tiddlywiki.org',
// programFilesFolderName: 'TiddlyWiki',
// shortcutFolderName: 'TiddlyWiki',
// description,
// exe: 'TidGi',
// name: 'TidGi',
// ui: {
// chooseDirectory: true,
// },
// appIconPath: 'build-resources/icon.ico',
// // WiX distributables do not handle prerelease information in the app version, removing it from the MSI (-prerelease3.4)
// // and https://github.com/felixrieseberg/electron-wix-msi/issues/110 ask use to use fixed number
// version: '1.0.0',
// };
// },
// },
{
name: '@electron-forge/maker-zip',
platforms: ['darwin'],
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@
"@electron-forge/maker-rpm": "7.4.0",
"@electron-forge/maker-snap": "7.4.0",
"@electron-forge/maker-squirrel": "7.4.0",
"@electron-forge/maker-wix": "7.4.0",
"electron-wix-msi": "^5.1.3",
"@electron-forge/maker-zip": "7.4.0",
"registry-js": "1.16.0"
},
Expand Down
61 changes: 0 additions & 61 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit fb04909

Please sign in to comment.