Skip to content

Commit

Permalink
fix: sets static paths for steps
Browse files Browse the repository at this point in the history
  • Loading branch information
erikreinert committed Jan 3, 2025
1 parent d663761 commit a3f5875
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 20 deletions.
14 changes: 0 additions & 14 deletions cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,6 @@ use vorpal_worker::artifact::ArtifactServer;
mod artifact;
mod build;

pub struct VorpalTomlLanguage {
pub name: String,
}

pub struct VorpalTomlRust {
pub bin: String,
pub path: String,
}

pub struct VorpalToml {
pub language: VorpalTomlLanguage,
pub rust: VorpalTomlRust,
}

#[derive(Subcommand)]
enum Command {
Artifact {
Expand Down
14 changes: 8 additions & 6 deletions sdk/src/config/artifact/steps.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use crate::config::artifact::get_artifact_envkey;
use indoc::formatdoc;
use std::collections::BTreeMap;
use std::env::var;
use vorpal_schema::vorpal::artifact::v0::{ArtifactId, ArtifactStep, ArtifactStepEnvironment};

// TODO: implement amber step
Expand All @@ -12,8 +11,7 @@ pub fn bash(environment: BTreeMap<&str, String>, script: String) -> ArtifactStep
let path_defined_default = "".to_string();
let path_defined = environment.get("PATH").unwrap_or(&path_defined_default);

let path_default = "/usr/bin:/usr/sbin".to_string();
let mut path = var("PATH").unwrap_or(path_default);
let mut path = "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin".to_string();

if !path_defined.is_empty() {
path = format!("{}:{}", path_defined, path);
Expand All @@ -35,7 +33,7 @@ pub fn bash(environment: BTreeMap<&str, String>, script: String) -> ArtifactStep
entrypoint: Some("bash".to_string()),
environments,
script: Some(formatdoc! {"
#!/bin/sh
#!/bin/bash
set -euo pipefail
{script}",
Expand Down Expand Up @@ -138,24 +136,28 @@ pub fn bwrap(
args.push(arg);
}

let path = "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin".to_string();

ArtifactStep {
arguments: args,
entrypoint: Some("bwrap".to_string()),
environments: vec![ArtifactStepEnvironment {
key: "PATH".to_string(),
value: var("PATH").unwrap_or_else(|_| "/usr/bin:/usr/sbin".to_string()),
value: path,
}],
script: Some(script),
}
}

pub fn docker(arguments: Vec<String>) -> ArtifactStep {
let path = "/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin".to_string();

ArtifactStep {
arguments,
entrypoint: Some("docker".to_string()),
environments: vec![ArtifactStepEnvironment {
key: "PATH".to_string(),
value: var("PATH").unwrap_or_else(|_| "/usr/bin:/usr/sbin".to_string()),
value: path,
}],
script: None,
}
Expand Down

0 comments on commit a3f5875

Please sign in to comment.