Skip to content
Merged
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
12 changes: 6 additions & 6 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ jobs:
matrix:
# We build a dynamic-linked linux binary because otherwise HSM support fails with:
# Error: IO: Dynamic loading not supported
os: [macos-13-large, ubuntu-20.04, ubuntu-22.04, windows-2022]
os: [macos-13-large, ubuntu-22.04, ubuntu-24.04, windows-2022]
include:
- os: macos-13-large
target: x86_64-apple-darwin
binary_path: target/x86_64-apple-darwin/release/dfx
- os: ubuntu-20.04
- os: ubuntu-22.04
target: x86_64-unknown-linux-gnu
binary_path: target/x86_64-unknown-linux-gnu/release/dfx
- os: ubuntu-22.04
- os: ubuntu-24.04
target: x86_64-unknown-linux-gnu
binary_path: target/x86_64-unknown-linux-gnu/release/dfx
- os: windows-2022
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13-large, ubuntu-20.04, ubuntu-22.04]
os: [macos-13-large, ubuntu-22.04, ubuntu-24.04]
steps:
- uses: actions/checkout@v4
- name: Download dfx binary
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-13-large, ubuntu-20.04, ubuntu-22.04]
os: [macos-13-large, ubuntu-22.04, ubuntu-24.04]
steps:
- name: Checking out repo
uses: actions/checkout@v4
Expand All @@ -192,7 +192,7 @@ jobs:
python-version: "3.9"
- name: Installing playwright
run: |
pip install playwright==1.40.0
pip install playwright==1.50.0
playwright install
playwright install-deps
- name: Download dfx binary
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
binary_path: target/x86_64-apple-darwin/release
name: x86_64-darwin
tar: gtar
- os: ubuntu-20.04
- os: ubuntu-22.04
target: x86_64-unknown-linux-gnu
binary_path: target/x86_64-unknown-linux-gnu/release
name: x86_64-linux
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
- name: Check dynamically-linked libraries (ubuntu)
run: |
ACTUAL="$(ldd ${{ matrix.binary_path }}/dfx | awk '{ print $1 }' | sort | awk -v d=" " '{s=(NR==1?s:s d)$0}END{printf "%s",s}')"
EXPECTED="/lib64/ld-linux-x86-64.so.2 libc.so.6 libdl.so.2 libgcc_s.so.1 libm.so.6 libpthread.so.0 libstdc++.so.6 linux-vdso.so.1"
EXPECTED="/lib64/ld-linux-x86-64.so.2 libc.so.6 libgcc_s.so.1 libm.so.6 libstdc++.so.6 linux-vdso.so.1"
echo "Dynamically-linked libraries:"
echo " Actual: $ACTUAL"
echo " Expected: $EXPECTED"
Expand Down
7 changes: 5 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,11 @@ Updated Motoko to [0.14.2](https://github.com/dfinity/motoko/releases/tag/0.14.2

### Replica

Updated replica to elected commit 2f02a660f6f17b5a78c13d9b372f74c8228f79b8.
This incorporates the following executed proposals:
Updated replica to non-elected commit ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3.

This includes X_OC_JWT and X_OC_API_KEY cors headers in PocketIC HTTP gateway (see https://github.com/dfinity/ic/pull/4154).

This also incorporates the following executed proposals up to commit 2f02a660f6f17b5a78c13d9b372f74c8228f79b8:

- [135422](https://dashboard.internetcomputer.org/proposal/135422)
- [135421](https://dashboard.internetcomputer.org/proposal/135421)
Expand Down
18 changes: 16 additions & 2 deletions Cargo.lock

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

8 changes: 4 additions & 4 deletions e2e/tests-dfx/ledger.bash
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ load ../utils/_
install_nns() {
dfx_start_for_nns_install

dfx extension install nns --version 0.4.3
dfx extension install nns --version 0.5.0
dfx nns install --ledger-accounts 345f723e9e619934daac6ae0f4be13a7b0ba57d6a608e511a00fd0ded5866752 22ca7edac648b814e81d7946e8bacea99280e07c5f51a04ba7a38009d8ad8e89 5a94fe181e9d411c58726cb87cbf2d016241b6c350bc3330e4869ca76e54ecbc
}

Expand Down Expand Up @@ -158,10 +158,10 @@ tc_to_num() {
balance=$(tc_to_num "$(dfx wallet balance)")

assert_command dfx ledger top-up "$wallet" --icp 5
assert_match "Canister was topped up with 617283500000000 cycles"
assert_match "Canister was topped up with 500000000000000 cycles"
balance_now=$(tc_to_num "$(dfx wallet balance)")

(( balance_now - balance > 600000000000000 ))
(( balance_now - balance > 400000000000000 ))

# Transaction Deduplication
t=$(current_time_nanoseconds)
Expand Down Expand Up @@ -204,7 +204,7 @@ tc_to_num() {
dfx_new
assert_command dfx canister create e2e_project_backend
assert_command dfx ledger top-up e2e_project_backend --amount 5
assert_contains "Canister was topped up with 617283500000000 cycles"
assert_contains "Canister was topped up with 500000000000000 cycles"
}

@test "ledger create-canister" {
Expand Down
Loading