Skip to content

Commit 2e57070

Browse files
authored
Merge branch 'main' into python3.13
2 parents 5adbbd4 + c9cdf44 commit 2e57070

30 files changed

+212
-242
lines changed

.github/workflows/contributed-recipes.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@ on:
1818
- "docs/using/recipe_code/**"
1919
workflow_dispatch:
2020
workflow_call:
21+
inputs:
22+
# There is no good way to detect if the workflow was called using workflow_call
23+
# https://github.com/actions/runner/discussions/1884
24+
called-using-workflow-call:
25+
description: "Was the workflow called using workflow_call"
26+
required: true
27+
type: boolean
2128

2229
jobs:
2330
generate-matrix:
@@ -43,8 +50,17 @@ jobs:
4350
- name: Checkout Repo ⚡️
4451
uses: actions/checkout@v4
4552

53+
- name: Load image to Docker 📥
54+
if: ${{ inputs.called-using-workflow-call && matrix.parent-image != '' }}
55+
uses: ./.github/actions/load-image
56+
with:
57+
image: ${{ matrix.parent-image }}
58+
platform: ${{ matrix.platform }}
59+
variant: default
60+
61+
# Not pulling the image, because it might be loaded from previous step or will be downloaded automatically
4662
- name: Build recipe 🛠
47-
run: docker build --pull --rm --force-rm --tag my-custom-image -f ./${{ matrix.dockerfile }} ./
63+
run: docker build --rm --force-rm --tag my-custom-image -f ./${{ matrix.dockerfile }} ./
4864
env:
4965
DOCKER_BUILDKIT: 1
5066
# Full logs for CI build

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

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@ jobs:
3939
runs-on: ${{ inputs.runs-on }}
4040

4141
steps:
42-
# Image with CUDA needs extra disk space
43-
- name: Free disk space 🧹
44-
if: contains(inputs.variant, 'cuda') && runner.arch == 'X64'
45-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
46-
with:
47-
tool-cache: false
48-
android: true
49-
dotnet: true
50-
haskell: true
51-
large-packages: false
52-
docker-images: false
53-
swap-storage: false
54-
5542
- name: Checkout Repo ⚡️
5643
uses: actions/checkout@v4
5744
- name: Create dev environment 📦
@@ -78,10 +65,6 @@ jobs:
7865
BUILDKIT_PROGRESS: plain
7966
shell: bash
8067

81-
- name: Run tests ✅
82-
run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
83-
shell: bash
84-
8568
- name: Write tags file 🏷
8669
run: |
8770
python3 -m tagging.write_tags_file --short-image-name ${{ inputs.image }} --tags-dir /tmp/jupyter/tags/ --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }} --variant ${{ inputs.variant }}
@@ -120,3 +103,7 @@ jobs:
120103
name: ${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}
121104
path: /tmp/jupyter/images/${{ inputs.image }}-${{ inputs.platform }}-${{ inputs.variant }}.tar.zst
122105
retention-days: 3
106+
107+
- name: Run tests ✅
108+
run: python3 -m tests.run_tests --short-image-name ${{ inputs.image }} --registry ${{ env.REGISTRY }} --owner ${{ env.OWNER }}
109+
shell: bash

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

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,6 @@ jobs:
3131
runs-on: ubuntu-24.04
3232

3333
steps:
34-
# Image with CUDA needs extra disk space
35-
- name: Free disk space 🧹
36-
if: contains(inputs.variant, 'cuda') && runner.arch == 'X64'
37-
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
38-
with:
39-
tool-cache: false
40-
android: true
41-
dotnet: true
42-
haskell: true
43-
large-packages: false
44-
docker-images: false
45-
swap-storage: false
46-
4734
- name: Checkout Repo ⚡️
4835
uses: actions/checkout@v4
4936
- name: Create dev environment 📦

0 commit comments

Comments
 (0)