Skip to content

Commit 2687d5c

Browse files
authored
Merge branch 'main' into python3.13
2 parents 90ae020 + 788d175 commit 2687d5c

File tree

22 files changed

+105
-197
lines changed

22 files changed

+105
-197
lines changed

.github/actions/create-dev-env/action.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@ description: Create a build environment
44
runs:
55
using: composite
66
steps:
7-
# actions/setup-python doesn't support Linux aarch64 runners
8-
# See: https://github.com/actions/setup-python/issues/108
9-
# python3 is manually preinstalled in the aarch64 VM self-hosted runner
107
- name: Set Up Python 🐍
118
uses: actions/setup-python@v5
129
with:
13-
python-version: 3.x
14-
if: runner.arch == 'X64'
10+
python-version: "3.12"
1511

1612
- name: Install Dev Dependencies 📦
1713
run: |

.github/workflows/aarch64-setup.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/contributed-recipes.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121

2222
jobs:
2323
generate-matrix:
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-24.04
2525
outputs:
2626
matrix: ${{ steps.set-matrix.outputs.matrix }}
2727
steps:
@@ -44,7 +44,6 @@ jobs:
4444
uses: actions/checkout@v4
4545

4646
- name: Build recipe 🛠
47-
# We're pulling here to avoid accidentally using an image that might be present on aarch64 self-hosted runner
4847
run: docker build --pull --rm --force-rm --tag my-custom-image -f ./${{ matrix.dockerfile }} ./
4948
env:
5049
DOCKER_BUILDKIT: 1

.github/workflows/docker-build-test-upload.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
steps:
4242
# Image with CUDA needs extra disk space
4343
- name: Free disk space 🧹
44-
if: contains(inputs.variant, 'cuda') && inputs.platform == 'x86_64'
44+
if: contains(inputs.variant, 'cuda') && runner.arch == 'X64'
4545
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
4646
with:
4747
tool-cache: false
@@ -57,18 +57,6 @@ jobs:
5757
- name: Create dev environment 📦
5858
uses: ./.github/actions/create-dev-env
5959

60-
# Self-hosted runners share a state (whole VM) between runs
61-
# Also, they might have running or stopped containers,
62-
# which are not cleaned up by `docker system prune`
63-
- name: Reset docker state and cleanup artifacts 🗑️
64-
if: inputs.platform != 'x86_64'
65-
run: |
66-
docker kill $(docker ps --quiet) || true
67-
docker rm $(docker ps --all --quiet) || true
68-
docker system prune --all --force
69-
rm -rf /tmp/jupyter/
70-
shell: bash
71-
7260
- name: Load parent built image to Docker 📥
7361
if: inputs.parent-image != ''
7462
uses: ./.github/actions/load-image

.github/workflows/docker-merge-tags.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323

2424
jobs:
2525
merge-tags:
26-
runs-on: ubuntu-latest
26+
runs-on: ubuntu-24.04
2727

2828
steps:
2929
- name: Checkout Repo ⚡️
@@ -41,7 +41,7 @@ jobs:
4141
with:
4242
name: ${{ inputs.image }}-aarch64-${{ inputs.variant }}-tags
4343
path: /tmp/jupyter/tags/
44-
if: github.repository_owner == 'jupyter' && !contains(inputs.variant, 'cuda')
44+
if: ${{ !contains(inputs.variant, 'cuda') }}
4545

4646
# Docker might be stuck when pulling images
4747
# https://github.com/docker/for-mac/issues/2083

.github/workflows/docker-tag-push.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ on:
2828

2929
jobs:
3030
tag-push:
31-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-24.04
3232

3333
steps:
3434
# Image with CUDA needs extra disk space
3535
- name: Free disk space 🧹
36-
if: contains(inputs.variant, 'cuda') && inputs.platform == 'x86_64'
36+
if: contains(inputs.variant, 'cuda') && runner.arch == 'X64'
3737
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
3838
with:
3939
tool-cache: false

.github/workflows/docker-wiki-update.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
wiki-update:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-24.04
1414

1515
steps:
1616
- name: Checkout Repo ⚡️

0 commit comments

Comments
 (0)