Skip to content
Merged
Show file tree
Hide file tree
Changes from 18 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
132 changes: 91 additions & 41 deletions Cargo.lock

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

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ members = [
[patch.crates-io.ic-agent]
version = "0.1.0"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
branch = "es-verify-cert-fetch-root-key"
rev = "27823e8856a1b534921c278f2cb0746cf17ab404"

[patch.crates-io.ic-types]
version = "0.1.2"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
branch = "es-verify-cert-fetch-root-key"
rev = "27823e8856a1b534921c278f2cb0746cf17ab404"

[patch.crates-io.ic-utils]
version = "0.1.0"
git = "https://github.com/dfinity/agent-rs.git"
branch = "next"
rev = "6c02ef4bf25d82652ceb60c93b9df1a8863f0524"
branch = "es-verify-cert-fetch-root-key"
rev = "27823e8856a1b534921c278f2cb0746cf17ab404"
17 changes: 9 additions & 8 deletions e2e/bats/build.bash
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,10 @@ teardown() {
dfx_start

webserver_port=$(cat .dfx/webserver-port)
assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
assert_command dfx canister --network ic create --all
assert_command dfx build --network ic
cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json

assert_command dfx canister --network actuallylocal create --all
assert_command dfx build --network actuallylocal
}

@test "build output for local network is in expected directory" {
Expand All @@ -110,10 +111,10 @@ teardown() {
@test "build output for non-local network is in expected directory" {
dfx_start
webserver_port=$(cat .dfx/webserver-port)
assert_command dfx config networks.ic.providers '[ "http://127.0.0.1:'$webserver_port'" ]'
dfx canister --network ic create --all
assert_command dfx build --network ic
assert_command ls .dfx/ic/canisters/e2e_project/
assert_command ls .dfx/ic/canisters/e2e_project/e2e_project.wasm
cat <<<$(jq .networks.actuallylocal.providers=[\"http://127.0.0.1:$webserver_port\"] dfx.json) >dfx.json
dfx canister --network actuallylocal create --all
assert_command dfx build --network actuallylocal
assert_command ls .dfx/actuallylocal/canisters/e2e_project/
assert_command ls .dfx/actuallylocal/canisters/e2e_project/e2e_project.wasm
}

Loading