Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump ubuntu #4131

Merged
merged 9 commits into from
Mar 5, 2025
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
4 changes: 3 additions & 1 deletion scripts/test-uis.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 “<!DOCTYPE html>”", "/"),
("[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")
Expand Down
2 changes: 1 addition & 1 deletion scripts/workflows/e2e-matrix.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down