From 5e133cc480f7136077362c73e0f98f981f3d1d02 Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Mon, 10 Jun 2024 21:10:42 +0000 Subject: [PATCH] chore: update to dfx 0.20.1 --- bazel/dfx.bzl | 6 +++--- rs/tests/sdk/dfx_smoke_test.rs | 4 +--- rs/tests/sdk/src/project.rs | 20 -------------------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/bazel/dfx.bzl b/bazel/dfx.bzl index cad89bccd0e..c0b47a2d81b 100644 --- a/bazel/dfx.bzl +++ b/bazel/dfx.bzl @@ -7,10 +7,10 @@ package(default_visibility = ["//visibility:public"]) exports_files(["dfx"]) """ -VERSION = "0.19.0" +VERSION = "0.20.1" SHA256 = { - "linux": "c40387d13ab6ed87349fa21a98835f8d384f867333806ee6b9025891ed96e5c5", - "darwin": "f61179fa9884f111dbec20c293d77472dcf66d04b0567818fe546437aadd8ce6", + "linux": "011c8a6ff9af0578ee2c8b0a7af3abc5b3d5950cc64421b4c3a7acd1fc18265e", + "darwin": "4b1c24805f655576fb97f61aba019fbbe7c1bdca0598a5c1a9220a4bfe80f460", } URL = "https://github.com/dfinity/sdk/releases/download/{version}/dfx-{version}-{arch}-{platform}.tar.gz" diff --git a/rs/tests/sdk/dfx_smoke_test.rs b/rs/tests/sdk/dfx_smoke_test.rs index b655af13e17..398e5877396 100644 --- a/rs/tests/sdk/dfx_smoke_test.rs +++ b/rs/tests/sdk/dfx_smoke_test.rs @@ -89,12 +89,10 @@ fn test(env: TestEnv) { dfx.ping(); - dfx.new_project("hello", FrontendType::None, BackendType::Motoko); + dfx.new_project("hello", FrontendType::SimpleAssets, BackendType::Motoko); let project_dir = fs::canonicalize(env.base_path()).unwrap().join("hello"); - project::add_frontend_canister(&log, &project_dir, "hello"); - let dfx = dfx.with_working_dir(&project_dir); dfx.deploy(); diff --git a/rs/tests/sdk/src/project.rs b/rs/tests/sdk/src/project.rs index b45a40bfa08..41512291395 100644 --- a/rs/tests/sdk/src/project.rs +++ b/rs/tests/sdk/src/project.rs @@ -5,26 +5,6 @@ use std::path::Path; const CANISTER_COUNTER_MO: &str = include_str!("../canisters/counter.mo"); -// dfx 0.19.0 cannot create a frontend canister if node is installed but npm is not -pub fn add_frontend_canister(log: &Logger, project_dir: &Path, project_name: &str) { - let canister_name = format!("{project_name}_frontend"); - let relative_assets_dir = "src/{project_name}_frontend/assets"; - let canister = json!({ - "type": "assets", - "dependencies": [ - format!("{project_name}_backend") - ], - "source": [ - relative_assets_dir - ] - }); - add_canister(log, project_dir, &canister_name, canister); - let assets_dir = project_dir.join(relative_assets_dir); - fs::create_dir_all(&assets_dir).unwrap(); - let sample_asset_path = assets_dir.join("sample-asset.txt"); - fs::write(sample_asset_path, "This is a sample asset!\n").unwrap(); -} - pub fn add_counter_canister(log: &Logger, project_dir: &Path) { add_motoko_canister(log, project_dir, "counter", CANISTER_COUNTER_MO); }