Skip to content

Commit 6cfcb5b

Browse files
committed
feat: update Electron build configuration with additional dependencies and Windows SDK detection
1 parent 6be3c0d commit 6cfcb5b

4 files changed

Lines changed: 50 additions & 3 deletions

File tree

.github/workflows/release-electron.yml

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
3030
STARQUERY_WINDOWS_CERTIFICATE_BASE64: ${{ secrets.STARQUERY_WINDOWS_CERTIFICATE_BASE64 }}
3131
STARQUERY_WINDOWS_CERTIFICATE_PASSWORD: ${{ secrets.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
32+
STARQUERY_MSIX_WINDOWS_KIT_VERSION: ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_VERSION }}
33+
STARQUERY_MSIX_WINDOWS_KIT_PATH: ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_PATH }}
3234
strategy:
3335
fail-fast: false
3436
matrix:
@@ -117,6 +119,23 @@ jobs:
117119
)
118120
"WINDOWS_CERTIFICATE_FILE=$certificatePath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
119121
122+
- name: Detect Windows SDK for MSIX
123+
if: runner.os == 'Windows' && env.STARQUERY_MSIX_WINDOWS_KIT_PATH == '' && env.STARQUERY_MSIX_WINDOWS_KIT_VERSION == ''
124+
shell: pwsh
125+
run: |
126+
$windowsKitBinRoot = 'C:\Program Files (x86)\Windows Kits\10\bin'
127+
$candidates = Get-ChildItem $windowsKitBinRoot -Directory |
128+
Where-Object { Test-Path (Join-Path $_.FullName 'x64\makeappx.exe') } |
129+
Sort-Object Name -Descending
130+
131+
if (-not $candidates -or $candidates.Count -eq 0) {
132+
throw "No usable Windows SDK with makeappx.exe found under $windowsKitBinRoot"
133+
}
134+
135+
$selectedVersion = $candidates[0].Name
136+
"STARQUERY_MSIX_WINDOWS_KIT_VERSION=$selectedVersion" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
137+
Write-Host "Using Windows SDK version $selectedVersion for MSIX packaging"
138+
120139
- name: Build Electron distributables
121140
env:
122141
STARQUERY_MAC_SIGN: ${{ runner.os == 'macOS' && env.APPLE_SIGN_CERTIFICATE_P12_BASE64 != '' && 'true' || 'false' }}
@@ -137,8 +156,6 @@ jobs:
137156
STARQUERY_MSIX_BACKGROUND_COLOR: ${{ vars.STARQUERY_MSIX_BACKGROUND_COLOR }}
138157
STARQUERY_MSIX_MIN_OS_VERSION: ${{ vars.STARQUERY_MSIX_MIN_OS_VERSION }}
139158
STARQUERY_MSIX_MAX_OS_VERSION_TESTED: ${{ vars.STARQUERY_MSIX_MAX_OS_VERSION_TESTED }}
140-
STARQUERY_MSIX_WINDOWS_KIT_VERSION: ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_VERSION }}
141-
STARQUERY_MSIX_WINDOWS_KIT_PATH: ${{ vars.STARQUERY_MSIX_WINDOWS_KIT_PATH }}
142159
STARQUERY_MSIX_SIGN: ${{ vars.STARQUERY_MSIX_SIGN }}
143160
WINDOWS_CERTIFICATE_PASSWORD: ${{ env.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
144161
run: pnpm --dir packages/electron make

packages/electron/forge.config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ module.exports = {
140140
name: '@electron-forge/maker-deb',
141141
config: {
142142
options: {
143+
bin: 'StarQuery',
143144
icon: pngIconPath,
144145
},
145146
},
@@ -148,6 +149,7 @@ module.exports = {
148149
name: '@electron-forge/maker-rpm',
149150
config: {
150151
options: {
152+
bin: 'StarQuery',
151153
icon: pngIconPath,
152154
},
153155
},

packages/electron/package.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636
},
3737
"dependencies": {
3838
"@duckdb/node-api": "1.5.1-r.1",
39-
"electron-squirrel-startup": "^1.0.1"
39+
"@elastic/elasticsearch": "^9.3.4",
40+
"bson": "^7.0.0",
41+
"cassandra-driver": "^4.8.0",
42+
"electron-squirrel-startup": "^1.0.1",
43+
"minio": "^8.0.7",
44+
"mongodb": "^7.1.1",
45+
"oracledb": "^6.10.0",
46+
"redis": "^5.11.0"
4047
}
4148
}

pnpm-lock.yaml

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)