From 7bdb19cc1be5d9fcd3f41ce317e2ac741830472a Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Tue, 3 Dec 2024 18:59:49 +0000 Subject: [PATCH 1/3] Downgrade to Julia 1.11.1 (#2178) --- images/minimal-notebook/setup-scripts/setup_julia.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/images/minimal-notebook/setup-scripts/setup_julia.py b/images/minimal-notebook/setup-scripts/setup_julia.py index 114e64c00f..e6221238dd 100755 --- a/images/minimal-notebook/setup-scripts/setup_julia.py +++ b/images/minimal-notebook/setup-scripts/setup_julia.py @@ -47,6 +47,11 @@ def get_latest_julia_url() -> tuple[str, str]: triplet = unify_aarch64(platform.machine()) + "-linux-gnu" file_info = [vf for vf in latest_version_files if vf["triplet"] == triplet][0] LOGGER.info(f"Latest version: {file_info['version']} url: {file_info['url']}") + if file_info["version"] == "1.11.2": + LOGGER.warning( + "Not using Julia 1.11.2, because it hangs in GitHub self-hosted runners" + ) + return file_info["url"].replace("1.11.2", "1.11.1"), "1.11.1" return file_info["url"], file_info["version"] From 976fbab11d760ea3766c241809f7b120bd8c2ec9 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Thu, 5 Dec 2024 15:58:38 +0000 Subject: [PATCH 2/3] Use another repo for prettier pre-commit (#2180) --- .pre-commit-config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 235184657e..0522c6bc2f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -61,8 +61,8 @@ repos: stages: [manual] # Autoformat: YAML, JSON, Markdown, etc. - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v4.0.0-alpha.8 + - repo: https://github.com/rbubley/mirrors-prettier + rev: v3.4.2 hooks: - id: prettier From 87b37b4fd818b219ecd4d42f2c14c8d454569d1b Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Mon, 9 Dec 2024 11:30:06 +0000 Subject: [PATCH 3/3] Specify protocol when using host.docker.internal proxy (#2181) --- tests/base-notebook/test_healthcheck.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/base-notebook/test_healthcheck.py b/tests/base-notebook/test_healthcheck.py index d5874c9a3c..36a8a4dcc3 100644 --- a/tests/base-notebook/test_healthcheck.py +++ b/tests/base-notebook/test_healthcheck.py @@ -82,7 +82,10 @@ def test_healthy( "env,cmd,user", [ ( - ["HTTPS_PROXY=host.docker.internal", "HTTP_PROXY=host.docker.internal"], + [ + "HTTPS_PROXY=https://host.docker.internal", + "HTTP_PROXY=http://host.docker.internal", + ], None, None, ), @@ -91,8 +94,8 @@ def test_healthy( "NB_USER=testuser", "CHOWN_HOME=1", "JUPYTER_PORT=8123", - "HTTPS_PROXY=host.docker.internal", - "HTTP_PROXY=host.docker.internal", + "HTTPS_PROXY=https://host.docker.internal", + "HTTP_PROXY=http://host.docker.internal", ], ["start-notebook.py", "--ServerApp.base_url=/test"], "root",