Skip to content

Commit 964b316

Browse files
committed
fix: converge windows packaging on dist:win
1 parent 591b121 commit 964b316

9 files changed

Lines changed: 1589 additions & 1599 deletions

File tree

.github/workflows/desktop-nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
"build_date=$buildDate" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8
7373
"short_sha=$shortSha" | Out-File -FilePath $env:GITHUB_OUTPUT -Append -Encoding utf8
7474
75-
- name: Build custom Windows installer
75+
- name: Build Windows installer
7676
shell: pwsh
7777
env:
7878
NEXU_CLOUD_URL: https://nexu.powerformer.net
@@ -85,7 +85,7 @@ jobs:
8585
POSTHOG_API_KEY: ${{ secrets.POSTHOG_API_KEY }}
8686
run: |
8787
$env:NEXU_DESKTOP_BUILD_TIME = (Get-Date).ToUniversalTime().ToString('o')
88-
pnpm --filter @nexu/desktop dist:win:custom
88+
pnpm --filter @nexu/desktop dist:win
8989
9090
- name: Prepare Windows release artifacts
9191
id: artifacts
@@ -102,7 +102,7 @@ jobs:
102102
New-Item -ItemType Directory -Force -Path $channelArtifacts | Out-Null
103103
Get-ChildItem -Path $channelArtifacts -File -ErrorAction SilentlyContinue | Remove-Item -Force
104104
105-
$sourceInstaller = Join-Path $releaseDir "nexu-setup-custom-$env:VERSION-x64.exe"
105+
$sourceInstaller = Join-Path $releaseDir "nexu-setup-$env:VERSION-x64.exe"
106106
if (-not (Test-Path $sourceInstaller)) {
107107
throw "Missing Windows installer: $sourceInstaller"
108108
}
File renamed without changes.

apps/desktop/build/win-custom-installer.nsi renamed to apps/desktop/build/win-installer.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RequestExecutionLevel user
2929
!include "FileFunc.nsh"
3030
!include "LogicLib.nsh"
3131
!include "nsDialogs.nsh"
32-
!include "win-custom-installer-lang.nsh"
32+
!include "win-installer-lang.nsh"
3333

3434
!define PRODUCT_PUBLISHER "Powerformer, Inc."
3535
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\Nexu.exe"

apps/desktop/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
"dist:mac:x64": "NEXU_DESKTOP_TARGET_ARCH=x64 node ./scripts/dist-mac.mjs",
2222
"dist:mac:unsigned": "node ./scripts/dist-mac.mjs --unsigned",
2323
"dist:win": "node ./scripts/dist-win.mjs",
24-
"dist:win:local": "node ./scripts/dist-win.mjs --local",
25-
"dist:win:custom": "node ./scripts/dist-win-custom.mjs",
26-
"dist:win:unsigned": "node ./scripts/dist-win.mjs --target=dir",
24+
"dist:win:local": "node ./scripts/dist-win-stage.mjs --local",
25+
"dist:win:unsigned": "node ./scripts/dist-win-stage.mjs --target=dir",
2726
"dist:mac:unsigned:arm64": "NEXU_DESKTOP_TARGET_ARCH=arm64 node ./scripts/dist-mac.mjs --unsigned",
2827
"dist:mac:unsigned:x64": "NEXU_DESKTOP_TARGET_ARCH=x64 node ./scripts/dist-mac.mjs --unsigned",
2928
"upload:sourcemaps": "node ./scripts/upload-sourcemaps.mjs",

apps/desktop/scripts/dist-win-custom.mjs

Lines changed: 0 additions & 333 deletions
This file was deleted.

0 commit comments

Comments
 (0)