mirror of
https://gitlab.com/vyla-entertainment/home.git
synced 2026-11-13 21:57:21 -05:00
Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 62883b3180 | |||
| 3c6ae0125b | |||
| be0810ea6d | |||
| dff55060e7 | |||
| df767b5ffc | |||
| 1b70c6784a | |||
| e25e1c93f9 | |||
| 4c708ad97c | |||
| b81a4e044b |
@@ -22,8 +22,8 @@ const clonedRepos = new Set();
|
||||
|
||||
function clonePrivateRepo(repoConfig, targetDir) {
|
||||
if (fs.existsSync(targetDir)) {
|
||||
console.log(`[DEV] ${repoConfig.name} already exists locally. Skipping clone to use local changes.`);
|
||||
return;
|
||||
console.log(`Removing stale ${repoConfig.name} before fresh clone...`);
|
||||
fs.rmSync(targetDir, { recursive: true, force: true });
|
||||
}
|
||||
|
||||
const token = process.env.GITLAB_TOKEN || process.env.VYLA_GITLAB_TOKEN;
|
||||
|
||||
@@ -27,6 +27,20 @@ workflows:
|
||||
export PATH="$HOME/.cargo/bin:$PATH"
|
||||
PACKAGE_VERSION=$(node -p "require('./package.json').version")
|
||||
node release.js --installer --tag="v$PACKAGE_VERSION"
|
||||
- name: Verify bundled node permissions
|
||||
script: |
|
||||
if [ -f "bin/node" ]; then
|
||||
chmod +x bin/node
|
||||
xattr -cr bin/node || true
|
||||
ls -la bin/node
|
||||
file bin/node
|
||||
fi
|
||||
APP_NODE=$(find src-tauri/target/release/bundle -name "node" -path "*bin*" 2>/dev/null | head -1)
|
||||
if [ -n "$APP_NODE" ]; then
|
||||
chmod +x "$APP_NODE"
|
||||
xattr -cr "$APP_NODE" || true
|
||||
ls -la "$APP_NODE"
|
||||
fi
|
||||
artifacts:
|
||||
- src-tauri/target/release/bundle/dmg/*.dmg
|
||||
- src-tauri/target/release/bundle/macos/*.app
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vyla-home",
|
||||
"version": "1.1.17",
|
||||
"version": "1.1.22",
|
||||
"description": "Vyla Home Desktop App Launcher",
|
||||
"main": "main.js",
|
||||
"scripts": {
|
||||
@@ -54,4 +54,4 @@
|
||||
"installerHeaderIcon": "build/icon.ico"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
11
release.js
11
release.js
@@ -295,11 +295,18 @@ function ensureBundledNode() {
|
||||
try {
|
||||
execSync(`tar -xzf node.tar.gz ${tarName}/bin/node`, { cwd: binDir });
|
||||
|
||||
fs.renameSync(path.join(binDir, tarName, 'bin', 'node'), path.join(binDir, 'node'));
|
||||
const extractedNode = path.join(binDir, tarName, 'bin', 'node');
|
||||
const finalNode = path.join(binDir, 'node');
|
||||
|
||||
fs.renameSync(extractedNode, finalNode);
|
||||
fs.rmSync(path.join(binDir, tarName), { recursive: true, force: true });
|
||||
fs.unlinkSync(tarPath);
|
||||
|
||||
execSync(`chmod +x "${path.join(binDir, 'node')}"`, { cwd: binDir });
|
||||
fs.chmodSync(finalNode, 0o755);
|
||||
|
||||
try {
|
||||
execSync(`xattr -d com.apple.quarantine "${finalNode}"`);
|
||||
} catch (_) { }
|
||||
|
||||
fs.writeFileSync(versionMarker, nodeVersion, 'utf8');
|
||||
resolve();
|
||||
|
||||
2
src-tauri/Cargo.lock
generated
2
src-tauri/Cargo.lock
generated
@@ -4222,7 +4222,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "vyla-home"
|
||||
version = "1.1.17"
|
||||
version = "1.1.22"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"serde",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "vyla-home"
|
||||
version = "1.1.17"
|
||||
version = "1.1.22"
|
||||
description = "Vyla Home Desktop App Launcher"
|
||||
edition = "2021"
|
||||
|
||||
|
||||
@@ -58,15 +58,23 @@ fn kill_child_process(child: &mut Child) {
|
||||
|
||||
fn find_node_binary(app: &tauri::App) -> Option<String> {
|
||||
if let Ok(resource_dir) = app.path().resource_dir() {
|
||||
#[cfg(windows)]
|
||||
let candidates = [
|
||||
resource_dir.join("bin").join("node.exe"),
|
||||
resource_dir.join("bin").join("node"),
|
||||
resource_dir.join("node.exe"),
|
||||
resource_dir.join("node"),
|
||||
resource_dir.join("_up_").join("bin").join("node.exe"),
|
||||
resource_dir.join("_up_").join("bin").join("node"),
|
||||
resource_dir.join("_up_").join("node.exe"),
|
||||
resource_dir.join("up").join("bin").join("node.exe"),
|
||||
resource_dir.join("up").join("node.exe"),
|
||||
];
|
||||
#[cfg(not(windows))]
|
||||
let candidates = [
|
||||
resource_dir.join("bin").join("node"),
|
||||
resource_dir.join("node"),
|
||||
resource_dir.join("_up_").join("bin").join("node"),
|
||||
resource_dir.join("_up_").join("node"),
|
||||
resource_dir.join("up").join("bin").join("node"),
|
||||
resource_dir.join("up").join("node"),
|
||||
];
|
||||
for candidate in candidates {
|
||||
if candidate.exists() {
|
||||
@@ -156,6 +164,7 @@ fn resolve_script_and_root(app: &tauri::App) -> (String, String) {
|
||||
let candidates = vec![
|
||||
resource_dir.join("main.js"),
|
||||
resource_dir.join("_up_").join("main.js"),
|
||||
resource_dir.join("up").join("main.js"),
|
||||
];
|
||||
|
||||
for candidate in candidates {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "Vyla Home",
|
||||
"version": "1.1.17",
|
||||
"version": "1.1.22",
|
||||
"identifier": "com.vyla.home",
|
||||
"build": {
|
||||
"frontendDist": "../ui"
|
||||
@@ -41,4 +41,4 @@
|
||||
"../node_modules/**/*"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -587,7 +587,7 @@ void main() {
|
||||
const data = e.payload || e;
|
||||
if (data && data.url) {
|
||||
setStatus("Launching...");
|
||||
window.location.href = data.url;
|
||||
window.location.replace(data.url);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user