From 6d4701cea6ecffeca734b4e55f231e65678ce4b7 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Tue, 11 Feb 2025 16:37:02 +0000 Subject: [PATCH 1/3] Use ubuntu-24.04-arm runners --- .github/workflows/docker.yml | 22 +++++++++++----------- docs/using/recipe_code/generate_matrix.py | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 50a10a4534..6d11dcbf37 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -66,7 +66,7 @@ jobs: parent-image: "" image: docker-stacks-foundation platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm x86_64-foundation: uses: ./.github/workflows/docker-build-test-upload.yml @@ -82,7 +82,7 @@ jobs: parent-image: docker-stacks-foundation image: base-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-foundation] x86_64-base: @@ -100,7 +100,7 @@ jobs: parent-image: base-notebook image: minimal-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-base] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -120,7 +120,7 @@ jobs: parent-image: minimal-notebook image: scipy-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-minimal] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -140,7 +140,7 @@ jobs: parent-image: minimal-notebook image: r-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-minimal] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -160,7 +160,7 @@ jobs: parent-image: minimal-notebook image: julia-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-minimal] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -180,7 +180,7 @@ jobs: parent-image: scipy-notebook image: tensorflow-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-scipy] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -211,7 +211,7 @@ jobs: parent-image: scipy-notebook image: pytorch-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-scipy] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -253,7 +253,7 @@ jobs: parent-image: scipy-notebook image: datascience-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-scipy] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -273,7 +273,7 @@ jobs: parent-image: scipy-notebook image: pyspark-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-scipy] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} @@ -293,7 +293,7 @@ jobs: parent-image: pyspark-notebook image: all-spark-notebook platform: aarch64 - runs-on: ubuntu-22.04-arm + runs-on: ubuntu-24.04-arm needs: [aarch64-pyspark] if: ${{ !contains(github.event.pull_request.title, '[FAST_BUILD]') }} diff --git a/docs/using/recipe_code/generate_matrix.py b/docs/using/recipe_code/generate_matrix.py index d3be960cec..7f98dd6e46 100755 --- a/docs/using/recipe_code/generate_matrix.py +++ b/docs/using/recipe_code/generate_matrix.py @@ -12,12 +12,12 @@ def generate_matrix() -> dict[str, Any]: dockerfiles = sorted(file.name for file in THIS_DIR.glob("*.dockerfile")) - runs_on = ["ubuntu-latest", "ubuntu-22.04-arm"] + runs_on = ["ubuntu-latest", "ubuntu-24.04-arm"] return { "dockerfile": dockerfiles, "runs-on": runs_on, "exclude": [ - {"dockerfile": "oracledb.dockerfile", "runs-on": "ubuntu-22.04-arm"} + {"dockerfile": "oracledb.dockerfile", "runs-on": "ubuntu-24.04-arm"} ], } From c4df7ce649c3beebae76a1ffa5f27532d94b843b Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Wed, 12 Feb 2025 14:22:07 +0000 Subject: [PATCH 2/3] Update changelog --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b54320de8..5d76b6ec48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,17 @@ This changelog only contains breaking and/or significant changes manually introduced to this repository (using Pull Requests). All image manifests can be found in [the wiki](https://github.com/jupyter/docker-stacks/wiki). +## 2025-02-12 + +Affected: all images. + +- **Non-breaking:**: switch from `ubuntu-22.04-arm` to `ubuntu-24.04-arm` runners. + ## 2025-02-11 Affected: all images. -- **Non-breaking:**: start using GitHub-hosted `aarch64` runners. +- **Non-breaking:**: start using `ubuntu-22.04-arm` GitHub-hosted `aarch64` runners. ## 2024-12-03 From 1d801b24b154b2cf66216bd47d0d7775edb875ba Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Wed, 12 Feb 2025 15:11:24 +0000 Subject: [PATCH 3/3] Add missing PR link --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c9da58b6bc..5e304410b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ All image manifests can be found in [the wiki](https://github.com/jupyter/docker Affected: all images. -- **Non-breaking:**: switch from `ubuntu-22.04-arm` to `ubuntu-24.04-arm` runners. +- **Non-breaking:**: switch from `ubuntu-22.04-arm` to `ubuntu-24.04-arm` runners ([#2209](https://github.com/jupyter/docker-stacks/pull/2209)). ## 2025-02-11