From 88a9cbe75bca318df05b61187eae54544d9355d4 Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Tue, 4 Mar 2025 14:48:20 +0100 Subject: [PATCH 1/8] chore: bump ubuntu --- .github/workflows/e2e.yml | 10 +++++----- .github/workflows/publish.yml | 2 +- scripts/workflows/e2e-matrix.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8d20b806ce..8d091743d1 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e95094effb..750d1bf4a8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 diff --git a/scripts/workflows/e2e-matrix.py b/scripts/workflows/e2e-matrix.py index 95e8a3ba7e..f8b52f989f 100755 --- a/scripts/workflows/e2e-matrix.py +++ b/scripts/workflows/e2e-matrix.py @@ -16,7 +16,7 @@ def test_scripts(prefix): matrix = { "test": test, "backend": ["pocketic", "replica"], - "os": ["macos-13-large", "ubuntu-20.04"], + "os": ["macos-13-large", "ubuntu-22.04"], "exclude": [ { "backend": "pocketic", From 22ada73cd08d1a7ab0966a79c506c3ae12cf2560 Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 10:25:37 +0100 Subject: [PATCH 2/8] rm dropped DLLs --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 750d1bf4a8..9591a8fffc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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" From 293b3bd0cf3cf0e854e35d7855e814f6e78b95b3 Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 10:36:05 +0100 Subject: [PATCH 3/8] try bumping playwright to resolve libasound2 issue --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 8d091743d1..5eb903e326 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -192,7 +192,7 @@ jobs: python-version: "3.9" - name: Installing playwright run: | - pip install playwright==1.40.0 + pip install playwright==1.50.1 playwright install playwright install-deps - name: Download dfx binary From c0648c842b3b4aac144d92176c5267ef70712053 Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 11:02:22 +0100 Subject: [PATCH 4/8] playwright 1.50.1 not published yet --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 5eb903e326..915d011b64 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -192,7 +192,7 @@ jobs: python-version: "3.9" - name: Installing playwright run: | - pip install playwright==1.50.1 + pip install playwright==1.50.0 playwright install playwright install-deps - name: Download dfx binary From 8266f3ba7cb4f8dbc0523535452ca92416225c6b Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 11:44:27 +0100 Subject: [PATCH 5/8] try adding new acceptable errors --- scripts/test-uis.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/test-uis.py b/scripts/test-uis.py index bb62b4b5ee..149538324c 100644 --- a/scripts/test-uis.py +++ b/scripts/test-uis.py @@ -43,7 +43,9 @@ "Message": "Caller 2vxsx-fae is not allowed to query ic00 method fetch_canister_logs" """.strip(), "/index.js", - ) + ), + ("[JavaScript Warning: \"This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “”.\" {file: \"http://127.0.0.1:4943/?canisterId=be2us-64aaa-aaaaa-qaabq-cai&id=bkyz2-fmaaa-aaaaa-qaaaq-cai\" line: 0}]", "/index.js"), + ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available\" {file: \"http://127.0.0.1:4943/index.js\" line: 0}]", "/index.js") ] _CANDID_UI_ERRORS_TO_IGNORE = [ ("Error", "/index.js") From 985b81bb7dd2a159c7f9115676dd31abecc25069 Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 12:05:06 +0100 Subject: [PATCH 6/8] mv warning to root --- scripts/test-uis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-uis.py b/scripts/test-uis.py index 149538324c..b0393f5455 100644 --- a/scripts/test-uis.py +++ b/scripts/test-uis.py @@ -45,7 +45,7 @@ "/index.js", ), ("[JavaScript Warning: \"This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “”.\" {file: \"http://127.0.0.1:4943/?canisterId=be2us-64aaa-aaaaa-qaabq-cai&id=bkyz2-fmaaa-aaaaa-qaaaq-cai\" line: 0}]", "/index.js"), - ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available\" {file: \"http://127.0.0.1:4943/index.js\" line: 0}]", "/index.js") + ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available\" {file: \"http://127.0.0.1:4943/index.js\" line: 0}]", "/") ] _CANDID_UI_ERRORS_TO_IGNORE = [ ("Error", "/index.js") From 51b0cc74b5e0228f27b63bb7b6d9ec1ad0d676c3 Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 12:46:43 +0100 Subject: [PATCH 7/8] fixed wrong endpoint --- scripts/test-uis.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/test-uis.py b/scripts/test-uis.py index b0393f5455..6621d33ef4 100644 --- a/scripts/test-uis.py +++ b/scripts/test-uis.py @@ -44,8 +44,8 @@ """.strip(), "/index.js", ), - ("[JavaScript Warning: \"This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “”.\" {file: \"http://127.0.0.1:4943/?canisterId=be2us-64aaa-aaaaa-qaabq-cai&id=bkyz2-fmaaa-aaaaa-qaaaq-cai\" line: 0}]", "/index.js"), - ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available\" {file: \"http://127.0.0.1:4943/index.js\" line: 0}]", "/") + ("[JavaScript Warning: \"This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “”", "/"), + ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available\" {file: \"http://127.0.0.1:4943/index.js\" line: 0}]", "/index.js") ] _CANDID_UI_ERRORS_TO_IGNORE = [ ("Error", "/index.js") From c45cc9ca0304ed2e6a980a72e6094d61a98415ef Mon Sep 17 00:00:00 2001 From: Severin Siffert Date: Wed, 5 Mar 2025 13:04:48 +0100 Subject: [PATCH 8/8] next try --- scripts/test-uis.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/test-uis.py b/scripts/test-uis.py index 6621d33ef4..a82d84fb49 100644 --- a/scripts/test-uis.py +++ b/scripts/test-uis.py @@ -45,7 +45,7 @@ "/index.js", ), ("[JavaScript Warning: \"This page is in Quirks Mode. Page layout may be impacted. For Standards Mode use “”", "/"), - ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available\" {file: \"http://127.0.0.1:4943/index.js\" line: 0}]", "/index.js") + ("[JavaScript Warning: \"asm.js type error: Asm.js optimizer disabled because no suitable wasm compiler is available", "/index.js") ] _CANDID_UI_ERRORS_TO_IGNORE = [ ("Error", "/index.js")