mirror of
https://gitlab.com/gabmus/envision.git
synced 2025-08-02 22:29:01 +00:00
fix(stardust): split git and cargo steps
This commit is contained in:
parent
06615f1f80
commit
030fe86274
1 changed files with 11 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
||||||
use crate::ui::job_worker::job::WorkerJob;
|
use crate::{build_tools::git::Git, paths::get_data_dir, ui::job_worker::job::WorkerJob};
|
||||||
use std::{collections::VecDeque, path::PathBuf};
|
use std::{collections::VecDeque, path::PathBuf};
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
|
@ -33,12 +33,18 @@ pub fn get_build_stardust_jobs(
|
||||||
) -> VecDeque<WorkerJob> {
|
) -> VecDeque<WorkerJob> {
|
||||||
let mut jobs = VecDeque::<WorkerJob>::new();
|
let mut jobs = VecDeque::<WorkerJob>::new();
|
||||||
|
|
||||||
|
let server_git_dir = get_data_dir() + "/stardust-xr-server";
|
||||||
|
|
||||||
|
let server_git_job = Git {
|
||||||
|
repo: server_spec.repo,
|
||||||
|
dir: server_git_dir.clone(),
|
||||||
|
default_branch: server_spec.branch,
|
||||||
|
};
|
||||||
|
jobs.extend(server_git_job.get_pre_build_jobs(true));
|
||||||
let mut args = vec![
|
let mut args = vec![
|
||||||
"install".into(),
|
"install".into(),
|
||||||
"--git".into(),
|
"--path".into(),
|
||||||
server_spec.repo,
|
server_git_dir,
|
||||||
"--branch".into(),
|
|
||||||
server_spec.branch,
|
|
||||||
"--root".into(),
|
"--root".into(),
|
||||||
prefix_path.to_string_lossy().to_string(),
|
prefix_path.to_string_lossy().to_string(),
|
||||||
"--no-default-features".into(),
|
"--no-default-features".into(),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue