Skip to content

Commit 6f074b4

Browse files
dfinity-botericswanson-dfinitysesi200ggreif
authored
chore: update replica version to ebb190bf (#4133)
* chore: update replica version to ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3 * Update CHANGELOG.md * chore: bump ubuntu (#4131) * bump `dfx` extension `nns` to 0.5.0 due to test failures * attempt to fix output mismatch see #4130 why this is needed --------- Co-authored-by: ericswanson-dfinity <[email protected]> Co-authored-by: Severin Siffert <[email protected]> Co-authored-by: Gabor Greif <[email protected]> Co-authored-by: Gabor Greif <[email protected]>
1 parent c6c8538 commit 6f074b4

File tree

10 files changed

+149
-130
lines changed

10 files changed

+149
-130
lines changed

.github/workflows/e2e.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,15 @@ jobs:
5353
matrix:
5454
# We build a dynamic-linked linux binary because otherwise HSM support fails with:
5555
# Error: IO: Dynamic loading not supported
56-
os: [macos-13-large, ubuntu-20.04, ubuntu-22.04, windows-2022]
56+
os: [macos-13-large, ubuntu-22.04, ubuntu-24.04, windows-2022]
5757
include:
5858
- os: macos-13-large
5959
target: x86_64-apple-darwin
6060
binary_path: target/x86_64-apple-darwin/release/dfx
61-
- os: ubuntu-20.04
61+
- os: ubuntu-22.04
6262
target: x86_64-unknown-linux-gnu
6363
binary_path: target/x86_64-unknown-linux-gnu/release/dfx
64-
- os: ubuntu-22.04
64+
- os: ubuntu-24.04
6565
target: x86_64-unknown-linux-gnu
6666
binary_path: target/x86_64-unknown-linux-gnu/release/dfx
6767
- os: windows-2022
@@ -109,7 +109,7 @@ jobs:
109109
strategy:
110110
fail-fast: false
111111
matrix:
112-
os: [macos-13-large, ubuntu-20.04, ubuntu-22.04]
112+
os: [macos-13-large, ubuntu-22.04, ubuntu-24.04]
113113
steps:
114114
- uses: actions/checkout@v4
115115
- name: Download dfx binary
@@ -182,7 +182,7 @@ jobs:
182182
strategy:
183183
fail-fast: false
184184
matrix:
185-
os: [macos-13-large, ubuntu-20.04, ubuntu-22.04]
185+
os: [macos-13-large, ubuntu-22.04, ubuntu-24.04]
186186
steps:
187187
- name: Checking out repo
188188
uses: actions/checkout@v4
@@ -192,7 +192,7 @@ jobs:
192192
python-version: "3.9"
193193
- name: Installing playwright
194194
run: |
195-
pip install playwright==1.40.0
195+
pip install playwright==1.50.0
196196
playwright install
197197
playwright install-deps
198198
- name: Download dfx binary

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
binary_path: target/x86_64-apple-darwin/release
3737
name: x86_64-darwin
3838
tar: gtar
39-
- os: ubuntu-20.04
39+
- os: ubuntu-22.04
4040
target: x86_64-unknown-linux-gnu
4141
binary_path: target/x86_64-unknown-linux-gnu/release
4242
name: x86_64-linux
@@ -86,7 +86,7 @@ jobs:
8686
- name: Check dynamically-linked libraries (ubuntu)
8787
run: |
8888
ACTUAL="$(ldd ${{ matrix.binary_path }}/dfx | awk '{ print $1 }' | sort | awk -v d=" " '{s=(NR==1?s:s d)$0}END{printf "%s",s}')"
89-
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"
89+
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"
9090
echo "Dynamically-linked libraries:"
9191
echo " Actual: $ACTUAL"
9292
echo " Expected: $EXPECTED"

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ Updated Motoko to [0.14.2](https://github.com/dfinity/motoko/releases/tag/0.14.2
2929

3030
### Replica
3131

32-
Updated replica to elected commit 2f02a660f6f17b5a78c13d9b372f74c8228f79b8.
33-
This incorporates the following executed proposals:
32+
Updated replica to non-elected commit ebb190bf1da0dba3e486b78c95cf5a3c5542e2f3.
33+
34+
This includes X_OC_JWT and X_OC_API_KEY cors headers in PocketIC HTTP gateway (see https://github.com/dfinity/ic/pull/4154).
35+
36+
This also incorporates the following executed proposals up to commit 2f02a660f6f17b5a78c13d9b372f74c8228f79b8:
3437

3538
- [135422](https://dashboard.internetcomputer.org/proposal/135422)
3639
- [135421](https://dashboard.internetcomputer.org/proposal/135421)

Cargo.lock

Lines changed: 16 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/tests-dfx/ledger.bash

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load ../utils/_
55
install_nns() {
66
dfx_start_for_nns_install
77

8-
dfx extension install nns --version 0.4.3
8+
dfx extension install nns --version 0.5.0
99
dfx nns install --ledger-accounts 345f723e9e619934daac6ae0f4be13a7b0ba57d6a608e511a00fd0ded5866752 22ca7edac648b814e81d7946e8bacea99280e07c5f51a04ba7a38009d8ad8e89 5a94fe181e9d411c58726cb87cbf2d016241b6c350bc3330e4869ca76e54ecbc
1010
}
1111

@@ -158,10 +158,10 @@ tc_to_num() {
158158
balance=$(tc_to_num "$(dfx wallet balance)")
159159

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

164-
(( balance_now - balance > 600000000000000 ))
164+
(( balance_now - balance > 400000000000000 ))
165165

166166
# Transaction Deduplication
167167
t=$(current_time_nanoseconds)
@@ -204,7 +204,7 @@ tc_to_num() {
204204
dfx_new
205205
assert_command dfx canister create e2e_project_backend
206206
assert_command dfx ledger top-up e2e_project_backend --amount 5
207-
assert_contains "Canister was topped up with 617283500000000 cycles"
207+
assert_contains "Canister was topped up with 500000000000000 cycles"
208208
}
209209

210210
@test "ledger create-canister" {

0 commit comments

Comments
 (0)