Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
MikailBag committed Jun 20, 2020
1 parent 63eef0a commit 8a281ba
Show file tree
Hide file tree
Showing 16 changed files with 47 additions and 226 deletions.
2 changes: 0 additions & 2 deletions .dockerignore

This file was deleted.

186 changes: 0 additions & 186 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion k8s/jjs/values.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
replicaCount: 1

image:
repositoryPrefix: cr.yandex/crpnhs4sen6hhp1m1mmq/
repositoryPrefix: docker.pkg.github.com/jjs-dev/jjs/
# Overrides the image tag whose default is the chart appVersion.
tag: latest

Expand Down
2 changes: 1 addition & 1 deletion src/client/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ pub mod prelude {
}

pub mod models {
pub use openapi::{api_version, run, run_patch, run_submit_simple_params, miscellaneous};
pub use openapi::{api_version, miscellaneous, run, run_patch, run_submit_simple_params};
}
#[derive(Clone)]
pub struct ApiClient {
Expand Down
9 changes: 0 additions & 9 deletions src/dist-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,6 @@ version = "0.1.0"
authors = ["Mikail Bagishov <[email protected]>"]
edition = "2018"


#[[bin]]
#name = "configure"
#path = "bin/configure.rs"

#[[bin]]
#name = "make"
#path = "bin/make.rs"

[dependencies]
structopt = "0.3.13"
serde_json = "1.0.51"
Expand Down
2 changes: 0 additions & 2 deletions src/dist-builder/src/artifact.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


pub(crate) struct Artifact {
pub(crate) package_name: String,
}
2 changes: 1 addition & 1 deletion src/dist-builder/src/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ impl<'a> Builder<'a> {
cmd.arg("--out-dir").arg(self.params.build.join("jjs-out"));
cmd.arg("-Zpackage-features");
for feat in &self.params.cfg.build.features {
cmd.arg("--features").arg(feat);
cmd.arg("--features").arg(feat);
}
cmd.arg("--locked");
for pkg in &self.packages {
Expand Down
2 changes: 1 addition & 1 deletion src/dist-builder/src/cfg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub struct BuildConfig {
pub profile: BuildProfile,
pub target: Option<String>,
pub tool_info: ToolInfo,
pub features: Vec<String>
pub features: Vec<String>,
}

#[derive(Debug, Clone)]
Expand Down
6 changes: 3 additions & 3 deletions src/dist-builder/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::{
package::{OtherPackage, RustPackage, Section},
};
use anyhow::Context as _;
use std::{path::PathBuf};
use std::path::PathBuf;
use structopt::StructOpt as _;

#[derive(structopt::StructOpt)]
Expand Down Expand Up @@ -73,7 +73,7 @@ struct Opt {
docker_name: Option<String>,
/// Features to enable
#[structopt(long = "enable-feature")]
features: Vec<String>
features: Vec<String>,
}

fn find_docker<'a>() -> &'a str {
Expand Down Expand Up @@ -110,7 +110,7 @@ fn main() {
target: opt.target.clone(),
profile,
tool_info,
features: opt.features.clone()
features: opt.features.clone(),
};
let mut comps_config = cfg::ComponentsConfig {
components: Vec::new(),
Expand Down
2 changes: 1 addition & 1 deletion src/invoker-api/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ pub struct InvokeTask {
/// Invocation id (will be preserved by invoker)
pub invocation_id: uuid::Uuid,
/// Run source
pub run_source: Vec<u8>
pub run_source: Vec<u8>,
}

/// Pass this to invoker running in CLI mode
Expand Down
8 changes: 5 additions & 3 deletions src/invoker/src/controller/tasks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ impl Controller {

let temp_invocation_dir = tempfile::tempdir().context("failed to create temporary dir")?;
let run_source_temp_file = temp_invocation_dir.path().join("source");


let temp_invocation_dir = temp_invocation_dir.into_path();
let interp_dict = {
Expand All @@ -157,8 +156,11 @@ impl Controller {
.map(|c| interpolate_command(c, &interp_dict))
.collect::<Result<_, _>>()
.context("invalid build commands template")?,
execute_command: interpolate_command(&toolchain.configuration.run_command, &interp_dict)
.context("invalid run command template")?,
execute_command: interpolate_command(
&toolchain.configuration.run_command,
&interp_dict,
)
.context("invalid run command template")?,
compile_limits: toolchain.configuration.limits,
problem_dir: problem_dir.to_path_buf(),
source_file_name: toolchain.configuration.filename.clone(),
Expand Down
Loading

0 comments on commit 8a281ba

Please sign in to comment.