mirror of
https://github.com/enso-org/enso.git
synced 2024-08-16 08:20:32 +03:00
Build script fixes & improvements (#8285)
This commit is contained in:
parent
36996c8938
commit
8021109d8c
3
.github/workflows/gui.yml
vendored
3
.github/workflows/gui.yml
vendored
@ -56,7 +56,6 @@ jobs:
|
|||||||
- run: ./run backend get
|
- run: ./run backend get
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
- if: failure() && runner.os == 'Windows'
|
- if: failure() && runner.os == 'Windows'
|
||||||
name: List files if failed (Windows)
|
name: List files if failed (Windows)
|
||||||
run: Get-ChildItem -Force -Recurse
|
run: Get-ChildItem -Force -Recurse
|
||||||
@ -113,7 +112,6 @@ jobs:
|
|||||||
- run: ./run backend get
|
- run: ./run backend get
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
- if: failure() && runner.os == 'Windows'
|
- if: failure() && runner.os == 'Windows'
|
||||||
name: List files if failed (Windows)
|
name: List files if failed (Windows)
|
||||||
run: Get-ChildItem -Force -Recurse
|
run: Get-ChildItem -Force -Recurse
|
||||||
@ -172,7 +170,6 @@ jobs:
|
|||||||
- run: ./run backend get
|
- run: ./run backend get
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
- if: failure() && runner.os == 'Windows'
|
- if: failure() && runner.os == 'Windows'
|
||||||
name: List files if failed (Windows)
|
name: List files if failed (Windows)
|
||||||
run: Get-ChildItem -Force -Recurse
|
run: Get-ChildItem -Force -Recurse
|
||||||
|
3
.github/workflows/scala-new.yml
vendored
3
.github/workflows/scala-new.yml
vendored
@ -70,7 +70,6 @@ jobs:
|
|||||||
AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
|
AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
- if: success() || failure()
|
- if: success() || failure()
|
||||||
name: Engine Test Reporter
|
name: Engine Test Reporter
|
||||||
uses: dorny/test-reporter@v1
|
uses: dorny/test-reporter@v1
|
||||||
@ -150,7 +149,6 @@ jobs:
|
|||||||
AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
|
AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
- if: success() || failure()
|
- if: success() || failure()
|
||||||
name: Engine Test Reporter
|
name: Engine Test Reporter
|
||||||
uses: dorny/test-reporter@v1
|
uses: dorny/test-reporter@v1
|
||||||
@ -232,7 +230,6 @@ jobs:
|
|||||||
AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
|
AWS_REGION: ${{ secrets.ENSO_LIB_S3_AWS_REGION }}
|
||||||
AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
|
AWS_SECRET_ACCESS_KEY: ${{ secrets.ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY }}
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
LC_ALL: C.UTF-8
|
|
||||||
- if: success() || failure()
|
- if: success() || failure()
|
||||||
name: Engine Test Reporter
|
name: Engine Test Reporter
|
||||||
uses: dorny/test-reporter@v1
|
uses: dorny/test-reporter@v1
|
||||||
|
739
Cargo.lock
generated
739
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -85,13 +85,17 @@ debug-assertions = true
|
|||||||
# We are tryingto maintain minimum set of dependencies. Before adding a new dependency, consult it
|
# We are tryingto maintain minimum set of dependencies. Before adding a new dependency, consult it
|
||||||
# with the core development team. Thank you!
|
# with the core development team. Thank you!
|
||||||
console-subscriber = "0.1.8"
|
console-subscriber = "0.1.8"
|
||||||
nix = "0.26.1"
|
dirs = { version = "5.0.1" }
|
||||||
|
nix = { version = "0.27.1" }
|
||||||
octocrab = { git = "https://github.com/enso-org/octocrab", default-features = false, features = [
|
octocrab = { git = "https://github.com/enso-org/octocrab", default-features = false, features = [
|
||||||
"rustls",
|
"rustls",
|
||||||
] }
|
] }
|
||||||
|
platforms = { version = "3.2.0", features = ["serde"] }
|
||||||
regex = { version = "1.6.0" }
|
regex = { version = "1.6.0" }
|
||||||
|
serde = { version = "1.0.130", features = ["derive", "rc"] }
|
||||||
serde_yaml = { version = "0.9.16" }
|
serde_yaml = { version = "0.9.16" }
|
||||||
serde-wasm-bindgen = { version = "0.4.5" }
|
serde-wasm-bindgen = { version = "0.4.5" }
|
||||||
|
sysinfo = { version = "0.29.10" }
|
||||||
tokio = { version = "1.23.0", features = ["full", "tracing"] }
|
tokio = { version = "1.23.0", features = ["full", "tracing"] }
|
||||||
tokio-stream = { version = "0.1.12", features = ["fs"] }
|
tokio-stream = { version = "0.1.12", features = ["fs"] }
|
||||||
tokio-util = { version = "0.7.4", features = ["full"] }
|
tokio-util = { version = "0.7.4", features = ["full"] }
|
||||||
@ -126,7 +130,8 @@ bytes = { version = "1.1.0" }
|
|||||||
matches = { version = "0.1" }
|
matches = { version = "0.1" }
|
||||||
console_error_panic_hook = { version = "0.1.6" }
|
console_error_panic_hook = { version = "0.1.6" }
|
||||||
reqwest = { version = "0.11.5", default-features = false, features = [
|
reqwest = { version = "0.11.5", default-features = false, features = [
|
||||||
"rustls-tls"
|
"rustls-tls",
|
||||||
|
"stream"
|
||||||
] }
|
] }
|
||||||
proc-macro2 = { version = "1.0.50" }
|
proc-macro2 = { version = "1.0.50" }
|
||||||
syn = { version = "2.0", features = [
|
syn = { version = "2.0", features = [
|
||||||
|
@ -53,7 +53,7 @@ js-sys = { workspace = true }
|
|||||||
mockall = { version = "0.7.1", features = ["nightly"] }
|
mockall = { version = "0.7.1", features = ["nightly"] }
|
||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
semver = { workspace = true }
|
semver = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
sha3 = { version = "0.8.2" }
|
sha3 = { version = "0.8.2" }
|
||||||
superslice = { workspace = true }
|
superslice = { workspace = true }
|
||||||
|
@ -18,7 +18,7 @@ enso-text = { path = "../../../../lib/rust/text" }
|
|||||||
const_format = { workspace = true }
|
const_format = { workspace = true }
|
||||||
failure = { workspace = true }
|
failure = { workspace = true }
|
||||||
itertools = { workspace = true }
|
itertools = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] }
|
uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
@ -19,7 +19,7 @@ futures = { workspace = true }
|
|||||||
hex = { version = "0.4.2" }
|
hex = { version = "0.4.2" }
|
||||||
json-rpc = { path = "../../../../lib/rust/json-rpc" }
|
json-rpc = { path = "../../../../lib/rust/json-rpc" }
|
||||||
mockall = { version = "0.7.1", features = ["nightly"] }
|
mockall = { version = "0.7.1", features = ["nightly"] }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
sha3 = { version = "0.8.2" }
|
sha3 = { version = "0.8.2" }
|
||||||
strum = { workspace = true }
|
strum = { workspace = true }
|
||||||
|
@ -7,7 +7,7 @@ authors = ["Enso Team <contact@enso.org>"]
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
chrono = { version = "0.4.19", features = ["serde"] }
|
chrono = { version = "0.4.19", features = ["serde"] }
|
||||||
csv = "1.1"
|
csv = "1.1"
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
enso-profiler = { path = "../../../lib/rust/profiler" }
|
enso-profiler = { path = "../../../lib/rust/profiler" }
|
||||||
enso-profiler-data = { path = "../../../lib/rust/profiler/data" }
|
enso-profiler-data = { path = "../../../lib/rust/profiler/data" }
|
||||||
ensogl-core = { path = "../../../lib/rust/ensogl/core" }
|
ensogl-core = { path = "../../../lib/rust/ensogl/core" }
|
||||||
|
@ -12,7 +12,7 @@ derive_more = { workspace = true }
|
|||||||
failure = { workspace = true }
|
failure = { workspace = true }
|
||||||
lazy_static = { workspace = true }
|
lazy_static = { workspace = true }
|
||||||
regex = { workspace = true }
|
regex = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive", "rc"] }
|
serde = { workspace = true }
|
||||||
uuid = { version = "0.8.1", features = ["serde", "v4", "wasm-bindgen"] }
|
uuid = { version = "0.8.1", features = ["serde", "v4", "wasm-bindgen"] }
|
||||||
ast-macros = { path = "../macros" }
|
ast-macros = { path = "../macros" }
|
||||||
enso-data-structures = { path = "../../../../../lib/rust/data-structures" }
|
enso-data-structures = { path = "../../../../../lib/rust/data-structures" }
|
||||||
|
@ -12,7 +12,7 @@ ast = { path = "../ast/impl" }
|
|||||||
enso-parser = { path = "../../../../lib/rust/parser" }
|
enso-parser = { path = "../../../../lib/rust/parser" }
|
||||||
enso-prelude = { path = "../../../../lib/rust/prelude" }
|
enso-prelude = { path = "../../../../lib/rust/prelude" }
|
||||||
enso-profiler = { path = "../../../../lib/rust/profiler" }
|
enso-profiler = { path = "../../../../lib/rust/profiler" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { version = "1.0", features = ["unbounded_depth"] }
|
serde_json = { version = "1.0", features = ["unbounded_depth"] }
|
||||||
enso-text = { path = "../../../../lib/rust/text" }
|
enso-text = { path = "../../../../lib/rust/text" }
|
||||||
failure = { version = "0.1" }
|
failure = { version = "0.1" }
|
||||||
|
@ -23,7 +23,7 @@ ensogl-icons = { path = "../../../lib/rust/ensogl/component/icons" }
|
|||||||
flo_stream = { version = "0.4.0" }
|
flo_stream = { version = "0.4.0" }
|
||||||
failure = { workspace = true }
|
failure = { workspace = true }
|
||||||
enso-notification = { path = "../../../lib/rust/notification" }
|
enso-notification = { path = "../../../lib/rust/notification" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = "1.0"
|
serde_json = "1.0"
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
@ -33,7 +33,7 @@ multi-map = { workspace = true }
|
|||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
ordered-float = { workspace = true }
|
ordered-float = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
strum = { workspace = true }
|
strum = { workspace = true }
|
||||||
uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] }
|
uuid = { version = "0.8", features = ["serde", "v4", "wasm-bindgen"] }
|
||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
|
@ -33,7 +33,7 @@ js-sys = { workspace = true }
|
|||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
ordered-float = { workspace = true }
|
ordered-float = { workspace = true }
|
||||||
parser = { path = "../../language/parser" }
|
parser = { path = "../../language/parser" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde-wasm-bindgen = { workspace = true }
|
serde-wasm-bindgen = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
sourcemap = "6.0"
|
sourcemap = "6.0"
|
||||||
|
@ -6,80 +6,48 @@ edition = "2021"
|
|||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
async-compression = "0.3.12"
|
|
||||||
async-trait = "0.1.51"
|
|
||||||
aws-config = "0.49.0"
|
aws-config = "0.49.0"
|
||||||
aws-sdk-ecr = "0.19.0"
|
aws-sdk-ecr = "0.19.0"
|
||||||
aws-sdk-s3 = "0.19.0"
|
aws-sdk-s3 = "0.19.0"
|
||||||
base64 = "0.13.0"
|
base64 = "0.13.0"
|
||||||
bytes = { workspace = true }
|
bytes = { workspace = true }
|
||||||
byte-unit = { workspace = true }
|
byte-unit = { workspace = true }
|
||||||
cached = "0.39.0"
|
|
||||||
cfg-if = "1.0.0"
|
|
||||||
chrono = { version = "0.4.19", features = ["serde"] }
|
chrono = { version = "0.4.19", features = ["serde"] }
|
||||||
clap = { version = "3.1.5", features = ["derive", "env", "wrap_help"] }
|
clap = { version = "3.1.5", features = ["derive", "env", "wrap_help"] }
|
||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
derive_more = { workspace = true }
|
derive_more = { workspace = true }
|
||||||
dirs = "4.0.0"
|
dirs = { workspace = true }
|
||||||
filetime = "0.2.15"
|
|
||||||
flate2 = "1.0.22"
|
|
||||||
flume = "0.10.10"
|
|
||||||
fs_extra = "1.2.0"
|
|
||||||
futures = { workspace = true }
|
futures = { workspace = true }
|
||||||
futures-util = "0.3.17"
|
futures-util = "0.3.17"
|
||||||
glob = "0.3.0"
|
glob = "0.3.0"
|
||||||
#graphql_client = "0.10.0"
|
|
||||||
handlebars = "4.3.5"
|
handlebars = "4.3.5"
|
||||||
heck = "0.4.0"
|
|
||||||
humantime = "2.1.0"
|
|
||||||
enso-build-base = { path = "../base" }
|
enso-build-base = { path = "../base" }
|
||||||
enso-enso-font = { path = "../../lib/rust/enso-font" }
|
enso-enso-font = { path = "../../lib/rust/enso-font" }
|
||||||
enso-font = { path = "../../lib/rust/font" }
|
enso-font = { path = "../../lib/rust/font" }
|
||||||
ensogl-pack = { path = "../../lib/rust/ensogl/pack" }
|
ensogl-pack = { path = "../../lib/rust/ensogl/pack" }
|
||||||
ide-ci = { path = "../ci_utils" }
|
ide-ci = { path = "../ci_utils" }
|
||||||
indexmap = "1.7.0"
|
|
||||||
indicatif = "0.17.1"
|
|
||||||
itertools = { workspace = true }
|
|
||||||
lazy_static = { workspace = true }
|
|
||||||
#git2 = "0.13.25"
|
|
||||||
mime = "0.3.16"
|
mime = "0.3.16"
|
||||||
new_mime_guess = "4.0.1"
|
new_mime_guess = "4.0.1"
|
||||||
nix = { workspace = true }
|
|
||||||
octocrab = { workspace = true }
|
octocrab = { workspace = true }
|
||||||
ouroboros = "0.15.0"
|
|
||||||
paste = { workspace = true }
|
|
||||||
path-absolutize = "3.0.11"
|
|
||||||
path-slash = "0.2.1"
|
path-slash = "0.2.1"
|
||||||
platforms = { version = "3.0.0", features = ["serde"] }
|
|
||||||
pin-project = "1.0.8"
|
|
||||||
port_check = "0.1.5"
|
port_check = "0.1.5"
|
||||||
pretty_env_logger = "0.4.0"
|
|
||||||
pulldown-cmark = "0.9.1"
|
pulldown-cmark = "0.9.1"
|
||||||
rand = "0.8.4"
|
|
||||||
regex = { workspace = true }
|
regex = { workspace = true }
|
||||||
reqwest = { version = "0.11.5", default-features = false, features = [
|
reqwest = { workspace = true }
|
||||||
"stream"
|
|
||||||
] }
|
|
||||||
semver = { workspace = true }
|
semver = { workspace = true }
|
||||||
serde = { version = "1.0.130", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde_yaml = { workspace = true }
|
serde_yaml = { workspace = true }
|
||||||
scopeguard = "1.1.0"
|
scopeguard = "1.1.0"
|
||||||
strum = { workspace = true }
|
strum = { workspace = true }
|
||||||
sysinfo = "0.26.2"
|
sysinfo = { workspace = true }
|
||||||
tar = "0.4.37"
|
|
||||||
tempfile = "3.2.0"
|
tempfile = "3.2.0"
|
||||||
toml = "0.5.8"
|
toml = "0.5.8"
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
tracing = { version = "0.1.37" }
|
tracing = { version = "0.1.37" }
|
||||||
tracing-subscriber = "0.3.11"
|
|
||||||
console-subscriber = { workspace = true }
|
|
||||||
unicase = "2.6.0"
|
|
||||||
url = "2.2.2"
|
url = "2.2.2"
|
||||||
uuid = { version = "1.1.0", features = ["v4"] }
|
uuid = { version = "1.1.0", features = ["v4"] }
|
||||||
walkdir = "2.3.2"
|
walkdir = "2.3.2"
|
||||||
which = "4.2.2"
|
|
||||||
whoami = "1.2.1"
|
|
||||||
zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
|
zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
@ -167,12 +167,7 @@ impl JobArchetype for BuildWasm {
|
|||||||
pub struct BuildBackend;
|
pub struct BuildBackend;
|
||||||
impl JobArchetype for BuildBackend {
|
impl JobArchetype for BuildBackend {
|
||||||
fn job(&self, os: OS) -> Job {
|
fn job(&self, os: OS) -> Job {
|
||||||
plain_job_customized(&os, "Build Backend", "backend get", |step| {
|
plain_job(&os, "Build Backend", "backend get")
|
||||||
let step = step
|
|
||||||
// This prevents https://github.com/sbt/sbt-assembly/issues/496
|
|
||||||
.with_env("LC_ALL", "C.UTF-8");
|
|
||||||
vec![step]
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -250,8 +245,8 @@ pub fn expose_os_specific_signing_secret(os: OS, step: Step) -> Step {
|
|||||||
secret::APPLE_NOTARIZATION_TEAM_ID,
|
secret::APPLE_NOTARIZATION_TEAM_ID,
|
||||||
&crate::ide::web::env::APPLETEAMID,
|
&crate::ide::web::env::APPLETEAMID,
|
||||||
)
|
)
|
||||||
.with_env(&crate::ide::web::env::CSC_IDENTITY_AUTO_DISCOVERY, "true")
|
.with_env(crate::ide::web::env::CSC_IDENTITY_AUTO_DISCOVERY, "true")
|
||||||
.with_env(&crate::ide::web::env::CSC_FOR_PULL_REQUEST, "true"),
|
.with_env(crate::ide::web::env::CSC_FOR_PULL_REQUEST, "true"),
|
||||||
_ => step,
|
_ => step,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -334,9 +329,7 @@ impl JobArchetype for CiCheckBackend {
|
|||||||
.with_secret_exposed_as(
|
.with_secret_exposed_as(
|
||||||
secret::ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY,
|
secret::ENSO_LIB_S3_AWS_SECRET_ACCESS_KEY,
|
||||||
crate::aws::env::AWS_SECRET_ACCESS_KEY,
|
crate::aws::env::AWS_SECRET_ACCESS_KEY,
|
||||||
)
|
);
|
||||||
// This prevents https://github.com/sbt/sbt-assembly/issues/496
|
|
||||||
.with_env("LC_ALL", "C.UTF-8");
|
|
||||||
vec![main_step, step::engine_test_reporter(os), step::stdlib_test_reporter(os)]
|
vec![main_step, step::engine_test_reporter(os), step::stdlib_test_reporter(os)]
|
||||||
})
|
})
|
||||||
.with_permission(Permission::Checks, Access::Write)
|
.with_permission(Permission::Checks, Access::Write)
|
||||||
|
@ -39,6 +39,8 @@ impl CommandProvider for Context {
|
|||||||
for property in &self.system_properties {
|
for property in &self.system_properties {
|
||||||
cmd.args(property);
|
cmd.args(property);
|
||||||
}
|
}
|
||||||
|
// This prevents https://github.com/sbt/sbt-assembly/issues/496
|
||||||
|
cmd.env(ide_ci::env::known::LC_ALL, ide_ci::env::known::C_UTF8);
|
||||||
Ok(cmd)
|
Ok(cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -43,6 +43,9 @@ async fn main() -> Result {
|
|||||||
ide_ci::fs::tokio::write(path, contents).await?;
|
ide_ci::fs::tokio::write(path, contents).await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
warn!("Remember to run formatter on the generated files!");
|
// Ensure that generated files are properly formatted.
|
||||||
|
enso_build::web::install(&repo_root).await?;
|
||||||
|
enso_build::web::run_script(&repo_root, enso_build::web::Script::Format).await?;
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
@ -11,31 +11,24 @@ async-trait = "0.1.51"
|
|||||||
bincode = "1.3.3"
|
bincode = "1.3.3"
|
||||||
byte-unit = { workspace = true }
|
byte-unit = { workspace = true }
|
||||||
bytes = { workspace = true }
|
bytes = { workspace = true }
|
||||||
cached = "0.39.0"
|
|
||||||
convert_case = { workspace = true }
|
|
||||||
cfg-if = "1.0.0"
|
|
||||||
chrono = { version = "0.4.19", features = ["serde"] }
|
chrono = { version = "0.4.19", features = ["serde"] }
|
||||||
clap = { version = "3.1.5", features = ["derive", "env"] }
|
clap = { version = "3.1.5", features = ["derive", "env"] }
|
||||||
cron = "0.12.0"
|
|
||||||
data-encoding = "2.3.2"
|
data-encoding = "2.3.2"
|
||||||
dependency_runner = "1.0.0"
|
dependency_runner = "1.0.0"
|
||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
derive_more = { workspace = true }
|
derive_more = { workspace = true }
|
||||||
dirs = "4.0.0"
|
dirs = { workspace = true }
|
||||||
enso-build-base = { path = "../base" }
|
enso-build-base = { path = "../base" }
|
||||||
enso-zst = { path = "../../lib/rust/zst" }
|
enso-zst = { path = "../../lib/rust/zst" }
|
||||||
filetime = "0.2.15"
|
|
||||||
flate2 = "1.0.22"
|
flate2 = "1.0.22"
|
||||||
flume = "0.10.10"
|
flume = "0.10.10"
|
||||||
fs_extra = "1.2.0"
|
fs_extra = "1.2.0"
|
||||||
futures = { workspace = true }
|
futures = { workspace = true }
|
||||||
futures-util = "0.3.17"
|
futures-util = "0.3.17"
|
||||||
glob = "0.3.0"
|
glob = "0.3.0"
|
||||||
graphql_client = "0.11.0"
|
|
||||||
headers = "0.3.7"
|
headers = "0.3.7"
|
||||||
heck = "0.4.0"
|
heck = "0.4.0"
|
||||||
http-serde = "1.1.0"
|
http-serde = "1.1.0"
|
||||||
indexmap = "1.7.0"
|
|
||||||
indicatif = { version = "0.17.1", features = ["tokio"] }
|
indicatif = { version = "0.17.1", features = ["tokio"] }
|
||||||
itertools = { workspace = true }
|
itertools = { workspace = true }
|
||||||
lazy_static = { workspace = true }
|
lazy_static = { workspace = true }
|
||||||
@ -43,33 +36,23 @@ log = "0.4.14"
|
|||||||
mime = "0.3.16"
|
mime = "0.3.16"
|
||||||
multimap = "0.8.3"
|
multimap = "0.8.3"
|
||||||
new_mime_guess = "4.0.0"
|
new_mime_guess = "4.0.0"
|
||||||
nix = { workspace = true }
|
|
||||||
octocrab = { workspace = true }
|
octocrab = { workspace = true }
|
||||||
paste = { workspace = true }
|
paste = { workspace = true }
|
||||||
path-absolutize = "3.0.11"
|
path-absolutize = "3.0.11"
|
||||||
pathdiff = "0.2.1"
|
pathdiff = "0.2.1"
|
||||||
path-slash = "0.2.1"
|
path-slash = "0.2.1"
|
||||||
platforms = "3.0.0"
|
platforms = { workspace = true }
|
||||||
pin-project = "1.0.8"
|
|
||||||
port_check = "0.1.5"
|
|
||||||
pretty_env_logger = "0.4.0"
|
|
||||||
proc-macro2 = { workspace = true }
|
|
||||||
quote = { workspace = true }
|
|
||||||
rand = "0.8.4"
|
rand = "0.8.4"
|
||||||
regex = { workspace = true }
|
regex = { workspace = true }
|
||||||
reqwest = { version = "0.11.5", default-features = false, features = [
|
reqwest = { workspace = true }
|
||||||
"stream",
|
|
||||||
] }
|
|
||||||
semver = { workspace = true }
|
semver = { workspace = true }
|
||||||
serde = { version = "1.0.130", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde_yaml = { workspace = true }
|
serde_yaml = { workspace = true }
|
||||||
scopeguard = "1.1.0"
|
|
||||||
sha2 = "0.10.2"
|
sha2 = "0.10.2"
|
||||||
strum = { workspace = true }
|
strum = { workspace = true }
|
||||||
symlink = "0.1.0"
|
symlink = "0.1.0"
|
||||||
syn = { workspace = true }
|
sysinfo = { workspace = true }
|
||||||
sysinfo = "0.26.2"
|
|
||||||
tar = "0.4.37"
|
tar = "0.4.37"
|
||||||
tempfile = "3.2.0"
|
tempfile = "3.2.0"
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
@ -82,7 +65,6 @@ url = "2.2.2"
|
|||||||
uuid = { version = "1.1.0", features = ["v4", "serde"] }
|
uuid = { version = "1.1.0", features = ["v4", "serde"] }
|
||||||
walkdir = "2.3.2"
|
walkdir = "2.3.2"
|
||||||
which = "4.2.2"
|
which = "4.2.2"
|
||||||
whoami = "1.2.1"
|
|
||||||
zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
|
zip = { version = "0.6.2", default-features = false, features = ["deflate"] }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
|
@ -836,7 +836,7 @@ impl Step {
|
|||||||
input: impl AsRef<str>,
|
input: impl AsRef<str>,
|
||||||
given_name: impl Into<String>,
|
given_name: impl Into<String>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let input_expr = get_input_expression(format!("secrets.{}", input.as_ref()));
|
let input_expr = get_input_expression(input.as_ref());
|
||||||
self.with_env(given_name, input_expr)
|
self.with_env(given_name, input_expr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ pub fn remove_var<K: AsRef<OsStr>>(key: K) {
|
|||||||
/// define_env_var! {
|
/// define_env_var! {
|
||||||
/// /// Documentation.
|
/// /// Documentation.
|
||||||
/// ENV_VAR_NAME, PathBuf;
|
/// ENV_VAR_NAME, PathBuf;
|
||||||
/// };
|
/// }
|
||||||
/// let path = ENV_VAR_NAME.get().unwrap_or_else(|_error| PathBuf::from("default"));
|
/// let path = ENV_VAR_NAME.get().unwrap_or_else(|_error| PathBuf::from("default"));
|
||||||
/// ```
|
/// ```
|
||||||
#[macro_export]
|
#[macro_export]
|
||||||
@ -117,18 +117,6 @@ pub fn prepend_to_path(path: impl AsRef<Path>) -> Result {
|
|||||||
known::PATH.prepend(path)
|
known::PATH.prepend(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
// pub async fn fix_duplicated_env_var(var_name: impl AsRef<OsStr>) -> Result {
|
|
||||||
// let var_name = var_name.as_ref();
|
|
||||||
//
|
|
||||||
// let mut paths = indexmap::IndexSet::new();
|
|
||||||
// while let Ok(path) = std::env::var(var_name) {
|
|
||||||
// paths.extend(std::env::split_paths(&path));
|
|
||||||
// std::env::remove_var(var_name);
|
|
||||||
// }
|
|
||||||
// crate::env::set_var(var_name, std::env::join_paths(paths)?);
|
|
||||||
// Ok(())
|
|
||||||
// }
|
|
||||||
|
|
||||||
/// A modification to some environment variable.
|
/// A modification to some environment variable.
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub enum Action {
|
pub enum Action {
|
||||||
|
8
build/ci_utils/src/env/accessor.rs
vendored
8
build/ci_utils/src/env/accessor.rs
vendored
@ -124,7 +124,7 @@ impl TypedVariable for PathBufVariable {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, derive_more::Deref)]
|
#[derive(Clone, Copy, Debug, Ord, PartialOrd, Eq, PartialEq, derive_more::Deref)]
|
||||||
pub struct SimpleVariable<Value, Borrowed: ?Sized = Value> {
|
pub struct SimpleVariable<Value, Borrowed: ?Sized = Value> {
|
||||||
#[deref]
|
#[deref]
|
||||||
pub name: &'static str,
|
pub name: &'static str,
|
||||||
@ -144,6 +144,12 @@ impl<Value, Borrowed: ?Sized> const AsRef<str> for SimpleVariable<Value, Borrowe
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<Value, Borrowed: ?Sized> AsRef<OsStr> for SimpleVariable<Value, Borrowed> {
|
||||||
|
fn as_ref(&self) -> &OsStr {
|
||||||
|
OsStr::new(self.name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<Value, Borrowed: ?Sized> From<&SimpleVariable<Value, Borrowed>> for String {
|
impl<Value, Borrowed: ?Sized> From<&SimpleVariable<Value, Borrowed>> for String {
|
||||||
fn from(value: &SimpleVariable<Value, Borrowed>) -> Self {
|
fn from(value: &SimpleVariable<Value, Borrowed>) -> Self {
|
||||||
value.name.to_string()
|
value.name.to_string()
|
||||||
|
15
build/ci_utils/src/env/known.rs
vendored
15
build/ci_utils/src/env/known.rs
vendored
@ -1,5 +1,6 @@
|
|||||||
//! Universally known environment variables.
|
//! Universally known environment variables.
|
||||||
|
|
||||||
|
use crate::define_env_var;
|
||||||
use crate::env::accessor::PathLike;
|
use crate::env::accessor::PathLike;
|
||||||
|
|
||||||
|
|
||||||
@ -9,3 +10,17 @@ use crate::env::accessor::PathLike;
|
|||||||
/// It is a special variable that contains a list of paths, that define the search path for
|
/// It is a special variable that contains a list of paths, that define the search path for
|
||||||
/// executable files.
|
/// executable files.
|
||||||
pub const PATH: PathLike = PathLike("PATH");
|
pub const PATH: PathLike = PathLike("PATH");
|
||||||
|
|
||||||
|
define_env_var! {
|
||||||
|
/// Variable in Unix-like systems that overrides individual `LC_*` settings for locale-specific
|
||||||
|
/// program behavior, such as time formatting (`LC_TIME`), string sorting (`LC_COLLATE`), and
|
||||||
|
/// currency formatting (`LC_MONETARY`). Setting `LC_ALL` ensures uniform application of locale
|
||||||
|
/// settings, commonly utilized in scripting and debugging to maintain consistency irrespective
|
||||||
|
/// of user-specific configurations.
|
||||||
|
LC_ALL, String;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The `C.UTF-8` locale, when used as a value for [`LC_ALL`] or other `LC_*` environment variables
|
||||||
|
/// in Unix-like systems, combines the minimalistic behavior of the default C locale with UTF-8
|
||||||
|
/// character encoding.
|
||||||
|
pub const C_UTF8: &str = "C.UTF-8";
|
||||||
|
@ -2,30 +2,23 @@
|
|||||||
name = "enso-build-cli"
|
name = "enso-build-cli"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
default-run = "enso-build-cli"
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = { workspace = true }
|
anyhow = { workspace = true }
|
||||||
byte-unit = { workspace = true }
|
byte-unit = { workspace = true }
|
||||||
clap = { version = "3.2.23", features = ["derive", "env", "wrap_help"] }
|
clap = { version = "3.2.23", features = ["derive", "env", "wrap_help"] }
|
||||||
chrono = "0.4.19"
|
|
||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
enso-build-base = { path = "../base" }
|
enso-build-base = { path = "../base" }
|
||||||
enso-build = { path = "../build" }
|
enso-build = { path = "../build" }
|
||||||
enso-formatter = { path = "../enso-formatter" }
|
enso-formatter = { path = "../enso-formatter" }
|
||||||
ensogl-pack = { path = "../../lib/rust/ensogl/pack" }
|
|
||||||
futures = { workspace = true }
|
|
||||||
futures-util = "0.3.17"
|
futures-util = "0.3.17"
|
||||||
glob = "0.3.0"
|
glob = "0.3.0"
|
||||||
humantime = "2.1.0"
|
humantime = "2.1.0"
|
||||||
ide-ci = { path = "../ci_utils" }
|
ide-ci = { path = "../ci_utils" }
|
||||||
octocrab = { workspace = true }
|
octocrab = { workspace = true }
|
||||||
serde = { version = "1.0.130", features = ["derive"] }
|
|
||||||
serde_json = { workspace = true }
|
|
||||||
serde_yaml = { workspace = true }
|
|
||||||
strum = { workspace = true }
|
|
||||||
tempfile = "3.2.0"
|
tempfile = "3.2.0"
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
toml = "0.5.9"
|
toml = "0.5.9"
|
||||||
tracing = { version = "0.1.37" }
|
tracing = { version = "0.1.37" }
|
||||||
tracing-subscriber = "0.3.11"
|
|
||||||
|
@ -8,6 +8,6 @@ edition = "2021"
|
|||||||
crate-type = ["rlib"]
|
crate-type = ["rlib"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde = { version = "1.0" }
|
serde = { workspace = true }
|
||||||
serde_yaml = { workspace = true }
|
serde_yaml = { workspace = true }
|
||||||
Inflector = { version = "0.11.4" }
|
Inflector = { version = "0.11.4" }
|
||||||
|
@ -17,7 +17,7 @@ crate-type = ["rlib", "cdylib"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
enso-prelude = { path = "../prelude" }
|
enso-prelude = { path = "../prelude" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
typenum = { version = "1.11.2" }
|
typenum = { version = "1.11.2" }
|
||||||
rustversion = { version = "1.0" }
|
rustversion = { version = "1.0" }
|
||||||
failure = { workspace = true }
|
failure = { workspace = true }
|
||||||
|
@ -22,7 +22,7 @@ const_format = { workspace = true }
|
|||||||
xi-rope = { version = "0.3.0" }
|
xi-rope = { version = "0.3.0" }
|
||||||
owned_ttf_parser = { workspace = true }
|
owned_ttf_parser = { workspace = true }
|
||||||
bincode = { workspace = true }
|
bincode = { workspace = true }
|
||||||
serde = { version = "1", features = ["rc"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
ordered-float = { workspace = true }
|
ordered-float = { workspace = true }
|
||||||
rustybuzz = { workspace = true }
|
rustybuzz = { workspace = true }
|
||||||
|
@ -16,7 +16,7 @@ failure = { workspace = true }
|
|||||||
js-sys = { workspace = true }
|
js-sys = { workspace = true }
|
||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
serde = { version = "1", features = ["rc", "derive"] }
|
serde = { workspace = true }
|
||||||
owned_ttf_parser = { workspace = true }
|
owned_ttf_parser = { workspace = true }
|
||||||
enso-web = { path = "../../../../../../web" }
|
enso-web = { path = "../../../../../../web" }
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ num-traits = { version = "0.2" }
|
|||||||
ordered-float = { workspace = true }
|
ordered-float = { workspace = true }
|
||||||
rustc-hash = { version = "1.0.1" }
|
rustc-hash = { version = "1.0.1" }
|
||||||
semver = { workspace = true }
|
semver = { workspace = true }
|
||||||
serde = { version = "1" }
|
serde = { workspace = true }
|
||||||
smallvec = { workspace = true }
|
smallvec = { workspace = true }
|
||||||
typenum = { version = "1.11.2" }
|
typenum = { version = "1.11.2" }
|
||||||
# We require exact version of wasm-bindgen because we do patching final js in our build process,
|
# We require exact version of wasm-bindgen because we do patching final js in our build process,
|
||||||
|
@ -11,12 +11,8 @@ crate-type = ["rlib"]
|
|||||||
futures = { version = "0.3" }
|
futures = { version = "0.3" }
|
||||||
ide-ci = { path = "../../../../build/ci_utils" }
|
ide-ci = { path = "../../../../build/ci_utils" }
|
||||||
manifest-dir-macros = "0.1.16"
|
manifest-dir-macros = "0.1.16"
|
||||||
regex = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde = { version = "1.0.130", features = ["derive"] }
|
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
tempfile = "3"
|
|
||||||
tokio = { workspace = true }
|
tokio = { workspace = true }
|
||||||
fs_extra = "1.2.0"
|
|
||||||
walkdir = "2"
|
walkdir = "2"
|
||||||
enso-bitmap = { path = "../../bitmap" }
|
|
||||||
enso-prelude = { path = "../../prelude" }
|
enso-prelude = { path = "../../prelude" }
|
||||||
|
@ -16,7 +16,7 @@ publish = true
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
enso-zst = { path = "../zst" }
|
enso-zst = { path = "../zst" }
|
||||||
serde = { version = "1.0.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
paste = { workspace = true }
|
paste = { workspace = true }
|
||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
|
@ -15,5 +15,5 @@ enso-profiler-data = { path = "../profiler/data" }
|
|||||||
enso-profiler = { path = "../profiler" }
|
enso-profiler = { path = "../profiler" }
|
||||||
futures = { version = "0.3.1" }
|
futures = { version = "0.3.1" }
|
||||||
failure = { workspace = true }
|
failure = { workspace = true }
|
||||||
serde = { version = "1.0.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
|
@ -9,6 +9,6 @@ proc-macro = true
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
enso-prelude = { path = "../prelude" }
|
enso-prelude = { path = "../prelude" }
|
||||||
serde = { version = "1.0" }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
proc-macro2 = "1.0"
|
proc-macro2 = "1.0"
|
||||||
|
@ -12,5 +12,5 @@ enso-metamodel = { path = "../" }
|
|||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
enso-reflect = { path = "../../reflect" }
|
enso-reflect = { path = "../../reflect" }
|
||||||
|
@ -16,7 +16,7 @@ enso-data-structures = { path = "../data-structures" }
|
|||||||
enso-types = { path = "../types" }
|
enso-types = { path = "../types" }
|
||||||
enso-shapely-macros = { path = "../shapely/macros" }
|
enso-shapely-macros = { path = "../shapely/macros" }
|
||||||
enso-parser-syntax-tree-visitor = { path = "src/syntax/tree/visitor" }
|
enso-parser-syntax-tree-visitor = { path = "src/syntax/tree/visitor" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
uuid = { version = "1.1", features = ["serde"] }
|
uuid = { version = "1.1", features = ["serde"] }
|
||||||
bincode = "1.3"
|
bincode = "1.3"
|
||||||
|
@ -15,5 +15,5 @@ enso-metamodel = { path = "../../metamodel", features = ["rust"] }
|
|||||||
enso-metamodel-lexpr = { path = "../../metamodel/lexpr" }
|
enso-metamodel-lexpr = { path = "../../metamodel/lexpr" }
|
||||||
enso-reflect = { path = "../../reflect" }
|
enso-reflect = { path = "../../reflect" }
|
||||||
lexpr = "0.2.6"
|
lexpr = "0.2.6"
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
|
@ -14,7 +14,7 @@ enso-parser = { path = ".." }
|
|||||||
enso-prelude = { path = "../../prelude" }
|
enso-prelude = { path = "../../prelude" }
|
||||||
enso-profiler = { path = "../../profiler" }
|
enso-profiler = { path = "../../profiler" }
|
||||||
enso-reflect = { path = "../../reflect" }
|
enso-reflect = { path = "../../reflect" }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
enso-metamodel = { path = "../../metamodel", features = ["rust"] }
|
enso-metamodel = { path = "../../metamodel", features = ["rust"] }
|
||||||
|
@ -13,7 +13,7 @@ license-file = "../../LICENSE"
|
|||||||
enso-metamodel = { path = "../../metamodel", features = ["rust"] }
|
enso-metamodel = { path = "../../metamodel", features = ["rust"] }
|
||||||
enso-parser = { path = ".." }
|
enso-parser = { path = ".." }
|
||||||
enso-reflect = { path = "../../reflect", features = ["graphviz"] }
|
enso-reflect = { path = "../../reflect", features = ["graphviz"] }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
|
@ -31,7 +31,7 @@ futures = { workspace = true }
|
|||||||
itertools = { workspace = true }
|
itertools = { workspace = true }
|
||||||
lazy_static = { workspace = true }
|
lazy_static = { workspace = true }
|
||||||
paste = { workspace = true }
|
paste = { workspace = true }
|
||||||
serde = { version = "1.0.126", features = ["derive", "rc"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
smallvec = { workspace = true }
|
smallvec = { workspace = true }
|
||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
|
@ -6,7 +6,7 @@ authors = ["Enso Team <contact@enso.org>"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
futures = { workspace = true }
|
futures = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { version = "1.0.59", features = ["raw_value"] }
|
serde_json = { version = "1.0.59", features = ["raw_value"] }
|
||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
enso-profiler-macros = { path = "macros" }
|
enso-profiler-macros = { path = "macros" }
|
||||||
|
@ -6,7 +6,7 @@ authors = ["Enso Team <contact@enso.org>"]
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
derivative = { workspace = true }
|
derivative = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
enso-prelude = { path = "../../prelude" }
|
enso-prelude = { path = "../../prelude" }
|
||||||
enso-profiler = { path = "../" }
|
enso-profiler = { path = "../" }
|
||||||
|
@ -21,9 +21,6 @@ default = []
|
|||||||
[dependencies]
|
[dependencies]
|
||||||
enso-zst = { path = "../zst" }
|
enso-zst = { path = "../zst" }
|
||||||
enso-shapely-macros = { path = "macros" }
|
enso-shapely-macros = { path = "macros" }
|
||||||
paste = { workspace = true }
|
|
||||||
derivative = { workspace = true }
|
|
||||||
rustversion = { version = "1.0" }
|
|
||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
|
|
||||||
[dependencies.web-sys]
|
[dependencies.web-sys]
|
||||||
|
@ -30,6 +30,3 @@ paste = { workspace = true }
|
|||||||
[dependencies.syn]
|
[dependencies.syn]
|
||||||
version = "1.0"
|
version = "1.0"
|
||||||
features = ['extra-traits', 'visit', 'full']
|
features = ['extra-traits', 'visit', 'full']
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
wasm-bindgen-test = "0.3.8"
|
|
||||||
|
@ -15,7 +15,7 @@ enso-web = { path = "../web" }
|
|||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
js-sys = { workspace = true }
|
js-sys = { workspace = true }
|
||||||
|
|
||||||
[dependencies.web-sys]
|
[dependencies.web-sys]
|
||||||
|
@ -16,7 +16,7 @@ enso-web = { path = "../../web" }
|
|||||||
wasm-bindgen = { workspace = true }
|
wasm-bindgen = { workspace = true }
|
||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
js-sys = { workspace = true }
|
js-sys = { workspace = true }
|
||||||
|
|
||||||
[dependencies.web-sys]
|
[dependencies.web-sys]
|
||||||
|
@ -11,4 +11,4 @@ crate-type = ["rlib", "cdylib"]
|
|||||||
enso-prelude = { path = "../prelude" }
|
enso-prelude = { path = "../prelude" }
|
||||||
enso-types = { path = "../types" }
|
enso-types = { path = "../types" }
|
||||||
xi-rope = { version = "0.3.0" }
|
xi-rope = { version = "0.3.0" }
|
||||||
serde = { version = "1", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
|
@ -11,7 +11,7 @@ enso-reflect = { path = "../reflect" }
|
|||||||
nalgebra = { workspace = true }
|
nalgebra = { workspace = true }
|
||||||
num-traits = { version = "0.2" }
|
num-traits = { version = "0.2" }
|
||||||
paste = { workspace = true }
|
paste = { workspace = true }
|
||||||
serde = { version = "1.0", features = ["derive"] }
|
serde = { workspace = true }
|
||||||
enso-prelude = { path = "../prelude" }
|
enso-prelude = { path = "../prelude" }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
|
@ -18,5 +18,5 @@ default = []
|
|||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bytemuck = { workspace = true }
|
bytemuck = { workspace = true }
|
||||||
serde = { version = "1.0.126", features = ["derive", "rc"] }
|
serde = { workspace = true }
|
||||||
paste = { workspace = true }
|
paste = { workspace = true }
|
||||||
|
10
run
10
run
@ -1,12 +1,4 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -e # Exit on error.
|
set -e # Exit on error.
|
||||||
|
|
||||||
# Get the directory of the script, as per https://stackoverflow.com/a/246128
|
cargo run --profile buildscript --package enso-build-cli -- $@
|
||||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
|
||||||
|
|
||||||
BIN_CRATE_NAME=enso-build-cli
|
|
||||||
TARGET_DIR="${SCRIPT_DIR}/target/enso-build/"
|
|
||||||
TARGET_EXE="${TARGET_DIR}buildscript/${BIN_CRATE_NAME}"
|
|
||||||
|
|
||||||
cargo build --profile buildscript --target-dir "$TARGET_DIR" --package ${BIN_CRATE_NAME}
|
|
||||||
"$TARGET_EXE" $@
|
|
||||||
|
4
run.cmd
4
run.cmd
@ -1,6 +1,4 @@
|
|||||||
@ pushd %~dp0
|
@ pushd %~dp0
|
||||||
@ set TARGET_DIR=%~dp0target\enso-build
|
cargo run --profile buildscript --package enso-build-cli -- %*
|
||||||
@ set TARGET_EXE=%TARGET_DIR%\buildscript\enso-build-cli.exe
|
|
||||||
cargo build --profile buildscript --target-dir "%TARGET_DIR%" --package enso-build-cli && "%TARGET_EXE%" %*
|
|
||||||
@ popd
|
@ popd
|
||||||
@ exit /b %ERRORLEVEL%
|
@ exit /b %ERRORLEVEL%
|
||||||
|
19
run.ps1
19
run.ps1
@ -5,17 +5,12 @@
|
|||||||
#
|
#
|
||||||
# This was developed and tested on Windows only, though there is no reason
|
# This was developed and tested on Windows only, though there is no reason
|
||||||
# why it should not work on other platforms through PowerShell Core.
|
# why it should not work on other platforms through PowerShell Core.
|
||||||
$ErrorActionPreference = "Stop"
|
|
||||||
$TargetDir = Join-Path $PSScriptRoot "target" "enso-build"
|
|
||||||
$BuildScriptProfile = "buildscript"
|
|
||||||
$BuildScriptBin = "enso-build-cli"
|
|
||||||
|
|
||||||
$TargetExe = Join-Path $TargetDir $BuildScriptProfile $BuildScriptBin
|
$RunArgs = @("run", "--profile", "buildscript", "--package", "enso-build-cli", "--")
|
||||||
|
$RunArgs += $args
|
||||||
|
|
||||||
$BuildArgs = "build", "--profile", $BuildScriptProfile, "--target-dir", $TargetDir, "--package", $BuildScriptBin
|
$psi = New-Object -TypeName System.Diagnostics.ProcessStartInfo -ArgumentList "cargo",$RunArgs
|
||||||
$BuildScriptProcess = Start-Process cargo -NoNewWindow -PassThru -Wait -WorkingDirectory $PSScriptRoot -ArgumentList $BuildArgs
|
$psi.WorkingDirectory = $PSScriptRoot
|
||||||
if ($BuildScriptProcess.ExitCode -ne 0) {
|
$handle = [System.Diagnostics.Process]::Start($psi)
|
||||||
Exit $BuildScriptProcess.ExitCode
|
$handle.WaitForExit()
|
||||||
}
|
Exit $handle.ExitCode
|
||||||
$BuildScriptBinProcess = Start-Process $TargetExe -NoNewWindow -PassThru -Wait -WorkingDirectory $PSScriptRoot -ArgumentList $args
|
|
||||||
Exit $BuildScriptBinProcess.ExitCode
|
|
||||||
|
Loading…
Reference in New Issue
Block a user