Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions .github/workflows/release-electron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ jobs:
Write-Host "Using Windows SDK version $selectedVersion for MSIX packaging"

- name: Build Electron distributables
if: runner.os != 'Windows'
env:
STARQUERY_MAC_SIGN: ${{ runner.os == 'macOS' && env.APPLE_SIGN_CERTIFICATE_P12_BASE64 != '' && 'true' || 'false' }}
STARQUERY_MAC_NOTARIZE: ${{ runner.os == 'macOS' && ((env.APPLE_NOTARY_API_KEY_P8_BASE64 != '' && env.APPLE_API_KEY_ID != '' && env.APPLE_API_ISSUER != '') || (env.APPLE_ID != '' && env.APPLE_APP_SPECIFIC_PASSWORD != '' && env.APPLE_TEAM_ID != '')) && 'true' || 'false' }}
Expand All @@ -160,6 +161,40 @@ jobs:
WINDOWS_CERTIFICATE_PASSWORD: ${{ env.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
run: pnpm --dir packages/electron make

- name: Package Electron app
if: runner.os == 'Windows'
run: pnpm --dir packages/electron exec electron-forge package

- name: Build Windows Squirrel distributable
if: runner.os == 'Windows'
env:
STARQUERY_MSIX_PUBLISHER: ${{ vars.STARQUERY_MSIX_PUBLISHER }}
STARQUERY_MSIX_PUBLISHER_DISPLAY_NAME: ${{ vars.STARQUERY_MSIX_PUBLISHER_DISPLAY_NAME }}
STARQUERY_MSIX_IDENTITY_NAME: ${{ vars.STARQUERY_MSIX_IDENTITY_NAME }}
STARQUERY_MSIX_PACKAGE_DISPLAY_NAME: ${{ vars.STARQUERY_MSIX_PACKAGE_DISPLAY_NAME }}
STARQUERY_MSIX_APP_DISPLAY_NAME: ${{ vars.STARQUERY_MSIX_APP_DISPLAY_NAME }}
STARQUERY_MSIX_BACKGROUND_COLOR: ${{ vars.STARQUERY_MSIX_BACKGROUND_COLOR }}
STARQUERY_MSIX_MIN_OS_VERSION: ${{ vars.STARQUERY_MSIX_MIN_OS_VERSION }}
STARQUERY_MSIX_MAX_OS_VERSION_TESTED: ${{ vars.STARQUERY_MSIX_MAX_OS_VERSION_TESTED }}
STARQUERY_MSIX_SIGN: ${{ vars.STARQUERY_MSIX_SIGN }}
WINDOWS_CERTIFICATE_PASSWORD: ${{ env.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
run: pnpm --dir packages/electron exec electron-forge make --skip-package --targets=@electron-forge/maker-squirrel

- name: Build Windows MSIX distributable
if: runner.os == 'Windows'
env:
STARQUERY_MSIX_PUBLISHER: ${{ vars.STARQUERY_MSIX_PUBLISHER }}
STARQUERY_MSIX_PUBLISHER_DISPLAY_NAME: ${{ vars.STARQUERY_MSIX_PUBLISHER_DISPLAY_NAME }}
STARQUERY_MSIX_IDENTITY_NAME: ${{ vars.STARQUERY_MSIX_IDENTITY_NAME }}
STARQUERY_MSIX_PACKAGE_DISPLAY_NAME: ${{ vars.STARQUERY_MSIX_PACKAGE_DISPLAY_NAME }}
STARQUERY_MSIX_APP_DISPLAY_NAME: ${{ vars.STARQUERY_MSIX_APP_DISPLAY_NAME }}
STARQUERY_MSIX_BACKGROUND_COLOR: ${{ vars.STARQUERY_MSIX_BACKGROUND_COLOR }}
STARQUERY_MSIX_MIN_OS_VERSION: ${{ vars.STARQUERY_MSIX_MIN_OS_VERSION }}
STARQUERY_MSIX_MAX_OS_VERSION_TESTED: ${{ vars.STARQUERY_MSIX_MAX_OS_VERSION_TESTED }}
STARQUERY_MSIX_SIGN: ${{ vars.STARQUERY_MSIX_SIGN }}
WINDOWS_CERTIFICATE_PASSWORD: ${{ env.STARQUERY_WINDOWS_CERTIFICATE_PASSWORD }}
run: pnpm --dir packages/electron exec electron-forge make --skip-package --targets=@electron-forge/maker-msix

- name: Upload workflow artifacts
uses: actions/upload-artifact@v4
with:
Expand Down
36 changes: 34 additions & 2 deletions packages/electron/scripts/vendor-runtime-dependencies.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,38 @@ function copyPackageTree(sourceDir, targetDir) {
});
}

async function vendorRuntimeDependencies(buildPath) {
function pruneVendoredPackage(packageName, targetPackageDir, targetPlatform, targetArch) {
if (packageName !== 'oracledb') {
return;
}

const releaseDir = path.join(targetPackageDir, 'build', 'Release');
if (!fs.existsSync(releaseDir)) {
return;
}

const expectedBinarySuffix = `-${targetPlatform}-${targetArch}.node`;
const releaseEntries = fs.readdirSync(releaseDir);

for (const entryName of releaseEntries) {
if (!entryName.startsWith('oracledb-')) {
continue;
}

const isNativeBinary = entryName.endsWith('.node');
const isBuildInfo = entryName.endsWith('.node-buildinfo.txt');
if (!isNativeBinary && !isBuildInfo) {
continue;
}

const matchesTarget = entryName.includes(expectedBinarySuffix);
if (!matchesTarget) {
fs.rmSync(path.join(releaseDir, entryName), { force: true });
}
}
}

async function vendorRuntimeDependencies(buildPath, targetPlatform, targetArch) {
const electronPackageJson = readJson(electronPackageJsonPath);
const pending = [...collectDependencyNames(electronPackageJson)];
const visited = new Set();
Expand All @@ -121,6 +152,7 @@ async function vendorRuntimeDependencies(buildPath) {

ensureDirectory(path.dirname(targetPackageDir));
copyPackageTree(installedPackageDir, targetPackageDir);
pruneVendoredPackage(packageName, targetPackageDir, targetPlatform, targetArch);

const installedPackageJson = readJson(installedPackageJsonPath);
for (const dependencyName of collectDependencyNames(installedPackageJson)) {
Expand All @@ -133,7 +165,7 @@ async function vendorRuntimeDependencies(buildPath) {

module.exports = async function afterCopy(buildPath, electronVersion, platform, arch, callback) {
try {
await vendorRuntimeDependencies(buildPath);
await vendorRuntimeDependencies(buildPath, platform, arch);
callback();
} catch (error) {
callback(error);
Expand Down
Loading