ci: create electron bins in pipeline scripts

Author: abose

package.json

@@ -6,7 +6,7 @@
     "scripts": {
         "tauri": "tauri",
         "tauriBuildDemoApp": "node src-build/createDemoReleaseConfig.js && tauri build --config ./src-tauri/tauri-local.conf.json",
-        "_ci-createDistReleaseConfig": "node src-build/ci-createDistReleaseConfig.js",
+        "_ci-setupDistFolders": "node src-build/ci-setupDistFolders.js",
         "_ci-env-warn": "echo !!!This script is supposed to executed in github actions only. Ignore if you are seeing this message in a github actions log.",
         "releaseSrc": "node src-build/createSrcRelease.js",
         "releaseSrcDebug": "node src-build/createSrcRelease.js --debug",
@@ -19,9 +19,10 @@
         "_ci_make_src-node": "node ./src-build/makeSrcNode.js phoenix/src-node",
         "_ci-clonePhoenixForTests": "npm run _ci-env-warn && node ./src-build/clonePhoenixForTests.js",
         "_ci-cloneAndBuildPhoenix": "npm run _ci-env-warn && node ./src-build/clonePhoenix.js && cd phoenix && npm ci && npm run build && cd ..",
-        "_ci-release:dev": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:dev && cd .. && npm run _ci-createDistReleaseConfig && npm run _ci_make_src-node",
-        "_ci-release:staging": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:staging && cd .. && npm run _ci-createDistReleaseConfig && npm run _ci_make_src-node",
-        "_ci-release:prod": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:prod && cd .. && npm run _ci-createDistReleaseConfig && npm run _ci_make_src-node",
+        "_ci-release:dev": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:dev && cd .. && npm run _ci-setupDistFolders && npm run _ci_make_src-node",
+        "_ci-release:staging": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:staging && cd .. && npm run _ci-setupDistFolders && npm run _ci_make_src-node",
+        "_ci-release:prod": "npm run _ci-env-warn && npm run _ci-cloneAndBuildPhoenix && cd phoenix && npm run release:prod && cd .. && npm run _ci-setupDistFolders && npm run _ci_make_src-node",
+        "_ci-releaseElectronApp": "cd src-electron && npm run build:appimage && cd ..",
         "_ci-update-phcode-build": "node src-build/update-phcode-build.js",
         "serve": "node src-build/serveForPlatform.js",
         "serve:tauri": "node src-build/serveForPlatform.js tauri",
@@ -48,4 +49,4 @@
         "branch": "tauri",
         "commit": "a6a2bcaaeadb8ad2a8320492640672dcdc1981f3"
     }
-}
+}

src-build/ci-createDistReleaseConfig.js src-build/ci-setupDistFolders.jssrc-build/ci-createDistReleaseConfig.js renamed to src-build/ci-setupDistFolders.js

@@ -49,7 +49,7 @@ function replaceBundleIdentifierString(sourceStr, newIdentifier) {
     return sourceStr.replace(IDENTIFIER_PLACEHOLDER, newIdentifier);
 }
 
-async function ciCreateDistReleaseConfig() {
+function ciCreateTauriDistReleaseConfig() {
     const phoenixConfigPath = join(__dirname, '..', 'phoenix', 'dist', 'config.json');
     const packageJSONPath = join(__dirname, '..', 'package.json');
     const tauriTOMLPath = join(__dirname, '..', 'src-tauri', 'Cargo.toml');
@@ -133,4 +133,50 @@ async function ciCreateDistReleaseConfig() {
     return phoenixVersion;
 }
 
-await ciCreateDistReleaseConfig();
+function createElectronReleaseAssets() {
+    console.log("=== Setting up Electron release assets ===");
+    const projectRoot = join(__dirname, '..');
+    const electronDir = join(projectRoot, 'src-electron');
+
+    // 1. Copy phoenix/dist/ to src-electron/phoenix-dist/
+    const phoenixDistSrc = join(projectRoot, 'phoenix', 'dist');
+    const phoenixDistDest = join(electronDir, 'phoenix-dist');
+    console.log('Copying phoenix dist to:', phoenixDistDest);
+    // Remove existing and copy fresh
+    if (fs.existsSync(phoenixDistDest)) {
+        fs.rmSync(phoenixDistDest, { recursive: true });
+    }
+    fs.cpSync(phoenixDistSrc, phoenixDistDest, { recursive: true });
+
+    // 2. Create config-effective.json based on environment
+    const configPath = join(electronDir, 'config.json');
+    const configEffectivePath = join(electronDir, 'config-effective.json');
+
+    // Read phoenix/dist/config.json for environment
+    const phoenixDistConfigPath = join(projectRoot, 'phoenix', 'dist', 'config.json');
+    const phoenixDistConfig = JSON.parse(fs.readFileSync(phoenixDistConfigPath));
+    const environment = phoenixDistConfig.config.environment; // "dev", "stage", or "production"
+
+    // Map environment to config file
+    const envConfigMap = {
+        'dev': 'config-dev.json',
+        'stage': 'config-staging.json',
+        'production': 'config-prod.json'
+    };
+    const envConfigFile = envConfigMap[environment] || 'config-dev.json';
+    const envConfigPath = join(electronDir, envConfigFile);
+
+    console.log(`Environment: ${environment} -> using ${envConfigFile}`);
+
+    // Merge config.json + env-specific config
+    const baseConfig = JSON.parse(fs.readFileSync(configPath));
+    const envConfig = JSON.parse(fs.readFileSync(envConfigPath));
+    const effectiveConfig = { ...baseConfig, ...envConfig };
+
+    console.log('phoenixLoadURL:', effectiveConfig.phoenixLoadURL);
+    console.log('gaMetricsURL:', effectiveConfig.gaMetricsURL);
+    fs.writeFileSync(configEffectivePath, JSON.stringify(effectiveConfig, null, 2));
+}
+
+ciCreateTauriDistReleaseConfig();
+createElectronReleaseAssets();

src-tauri/src/main.rs

@@ -542,12 +542,12 @@ fn main() {
         std::process::exit(0);
     }
     #[cfg(target_os = "macos")]{
-        tauri_plugin_deep_link::prepare("io.phcode");
+        tauri_plugin_deep_link::prepare("io.phcode.dev");
     }
 
     // warning: any string that resembles the following strings will be rewritten in source in prod by build scripts.
     // This is so that app bundle IDs are correct. IF they are app bundle IDs use the strings. else dont.
-    // do not use strings: "io.phcode.dev" "io.phcode.staging" "io.phcode" for anything other than bundle identifiers
+    // do not use strings: "TAURI_BUNDLE_IDENTIFIER_PLACE_HOLDER" "TAURI_BUNDLE_IDENTIFIER_PLACE_HOLDER" "io.phcode" for anything other than bundle identifiers
     // in this file!!!
 
     // GUI apps on macOS and Linux do not inherit the $PATH from your shell dotfiles (.bashrc, .bash_profile, .zshrc, etc).

src-tauri/tauri.conf.json

@@ -3,7 +3,7 @@
     "build": {
         "beforeBuildCommand": "",
         "devPath": "http://localhost:8000/src/",
-        "distDir": "../src/",
+        "distDir": "../phoenix/dist/",
         "withGlobalTauri": true
     },
     "package": {
@@ -434,8 +434,8 @@
                     ]
                 },
                 {
-                    "scheme": "http",
-                    "domain": "localhost:8000",
+                    "scheme": "https",
+                    "domain": "dev.phcode.dev",
                     "enableTauriAPI": true,
                     "windows": [
                         "healthData"
@@ -464,19 +464,20 @@
                 "width": 1366,
                 "minWidth": 800,
                 "acceptFirstMouse": true,
-                "fileDropEnabled": false
+                "fileDropEnabled": false,
+                "url": "phtauri://localhost/v5.1.0/"
             },
             {
                 "label": "healthData",
                 "title": "Health data window",
-                "url": "http://localhost:8000/src/desktop-metrics.html",
+                "url": "https://dev.phcode.dev/desktop-metrics.html",
                 "visible": false,
                 "fileDropEnabled": false
             },
             {
                 "label": "fileDrop",
                 "title": "Drop To Open Files",
-                "url": "http://localhost:8000/src/drop-files.html",
+                "url": "phtauri://localhost/v5.1.0/drop-files.html",
                 "visible": false,
                 "fileDropEnabled": true,
                 "decorations": false