Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try to revert to deno_core 0.270.0 #492

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ workflows:
name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>)
matrix:
parameters:
platform: [amd_centos, arm_ubuntu, amd_macos, arm_macos, amd_windows]
platform: [amd_centos, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
rust_channel: [stable]
command: [test]

Expand All @@ -63,7 +63,7 @@ workflows:
name: Run cargo tests (<< matrix.rust_channel >> rust on << matrix.platform >>)
matrix:
parameters:
platform: [amd_centos, arm_ubuntu, amd_macos, arm_macos, amd_windows]
platform: [amd_centos, arm_ubuntu, amd_linux, amd_macos, arm_macos, amd_windows]
rust_channel: [stable]
command: [test]
<<: *any_release
Expand Down Expand Up @@ -215,7 +215,12 @@ executors:
resource_class: xlarge
environment:
XTASK_TARGET: "x86_64-unknown-linux-gnu"

amd_linux: &amd_linux_build_executor
docker:
- image: cimg/base:stable
resource_class: xlarge
environment:
XTASK_TARGET: "x86_64-unknown-linux-gnu"
arm_ubuntu: &arm_ubuntu_executor
machine:
image: ubuntu-2004:2022.04.1
Expand Down
102 changes: 23 additions & 79 deletions federation-2/Cargo.lock

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

4 changes: 2 additions & 2 deletions federation-2/harmonizer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ include = [
apollo-federation-types = { version = "0.11.0", path = "../../apollo-federation-types", default-features = false, features = [
"build",
] }
deno_core = "0.280.0"
deno_core = "0.265.0"
serde = { version = "1", features = ["derive"] }
serde_json = "1"

[dev-dependencies]
insta = "1.34.0"

[build-dependencies]
deno_core = "0.280.0"
deno_core = "0.265.0"
semver = "1"
serde_json = "1"
toml_edit = "0.19"
Expand Down
10 changes: 8 additions & 2 deletions federation-2/harmonizer/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,19 @@ fn create_snapshot(out_dir: &Path) -> Result<(), Box<dyn Error>> {
// functions for interacting with it.
let runtime_str = read_to_string("bundled/runtime.js").unwrap();
runtime
.execute_script("<init>", runtime_str)
.execute_script(
"<init>",
deno_core::FastString::from(runtime_str.to_string()),
)
.expect("unable to initialize router bridge runtime environment");

// Load the composition library.
let bridge_str = read_to_string("bundled/composition_bridge.js").unwrap();
runtime
.execute_script("composition_bridge.js", bridge_str)
.execute_script(
"composition_bridge.js",
deno_core::FastString::from(bridge_str.to_string()),
)
.expect("unable to evaluate bridge module");

// Create our base query snapshot which will be included in
Expand Down
14 changes: 10 additions & 4 deletions federation-2/harmonizer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,24 +71,30 @@ pub fn harmonize_limit(

// store the subgraph definition JSON in the `serviceList` variable
runtime
.execute_script("<set_service_list>", service_list_javascript)
.execute_script(
"<set_service_list>",
deno_core::FastString::from(service_list_javascript.to_string()),
)
.expect("unable to evaluate service list in JavaScript runtime");

// store the nodes_limit variable in the nodesLimit variable
runtime
.execute_script(
"<set_nodes_limit>",
format!(
deno_core::FastString::from(format!(
"nodesLimit = {}",
nodes_limit
.map(|n| n.to_string())
.unwrap_or("null".to_string())
),
)),
)
.expect("unable to evaluate nodes limit in JavaScript runtime");

// run the unmodified do_compose.js file, which expects `serviceList` to be set
match runtime.execute_script("do_compose", include_str!("../bundled/do_compose.js")) {
match runtime.execute_script(
"do_compose",
deno_core::FastString::from_static(include_str!("../bundled/do_compose.js")),
) {
Ok(execute_result) => {
let scope = &mut runtime.handle_scope();
let local = deno_core::v8::Local::new(scope, execute_result);
Expand Down
24 changes: 12 additions & 12 deletions federation-2/router-bridge/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ include = [
[dependencies]
anyhow = "1.0.79"
async-channel = "1.9.0"
deno_console = "0.151.0"
deno_core = "0.280.0"
deno_crypto = "0.165.0"
deno_url = "0.151.0"
deno_web = "0.182.0"
deno_webidl = "0.151.0"
deno_console = "0.140.0"
deno_core = "0.265.0"
deno_crypto = "0.154.0"
deno_url = "0.140.0"
deno_web = "0.171.0"
deno_webidl = "0.140.0"
rand = "0.8.5"
serde = { version = "1.0.195", features = ["derive"] }
serde_json = { version = "1.0.111", features = ["preserve_order"] }
Expand All @@ -46,12 +46,12 @@ tracing-test = "0.2.1"
criterion = { version = "0.4", features = ["async_tokio", "async_futures"] }

[build-dependencies]
deno_console = "0.151.0"
deno_core = "0.280.0"
deno_crypto = "0.165.0"
deno_url = "0.151.0"
deno_web = "0.182.0"
deno_webidl = "0.151.0"
deno_console = "0.140.0"
deno_core = "0.265.0"
deno_crypto = "0.154.0"
deno_url = "0.140.0"
deno_web = "0.171.0"
deno_webidl = "0.140.0"
which = "4.4.2"

[features]
Expand Down
Loading