Try use macos runners to build aarch64 images

jupyter · Oct 9, 2023 · e08dcb9 · e08dcb9
1 parent fbbf245
commit e08dcb9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 238 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -59,7 +59,7 @@ jobs:
       parentImage: ""
       image: docker-stacks-foundation
       platform: aarch64
-      runsOn: ARM64
+      runsOn: macos-latest-xlarge
     if: github.repository == 'jupyter/docker-stacks'
 
   x86_64-foundation:
@@ -70,176 +70,6 @@ jobs:
       platform: x86_64
       runsOn: ubuntu-latest
 
-  aarch64-base:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: docker-stacks-foundation
-      image: base-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-foundation]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-base:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: docker-stacks-foundation
-      image: base-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-foundation]
-
-  aarch64-minimal:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: base-notebook
-      image: minimal-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-base]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-minimal:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: base-notebook
-      image: minimal-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-base]
-
-  aarch64-scipy:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: minimal-notebook
-      image: scipy-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-minimal]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-scipy:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: minimal-notebook
-      image: scipy-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-minimal]
-
-  aarch64-r:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: minimal-notebook
-      image: r-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-minimal]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-r:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: minimal-notebook
-      image: r-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-minimal]
-
-  aarch64-julia:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: minimal-notebook
-      image: julia-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-minimal]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-julia:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: minimal-notebook
-      image: julia-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-minimal]
-
-  aarch64-tensorflow:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: scipy-notebook
-      image: tensorflow-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-scipy]
-
-  x86_64-tensorflow:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: scipy-notebook
-      image: tensorflow-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-scipy]
-
-  aarch64-datascience:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: scipy-notebook
-      image: datascience-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-scipy]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-datascience:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: scipy-notebook
-      image: datascience-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-scipy]
-
-  aarch64-pyspark:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: scipy-notebook
-      image: pyspark-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-scipy]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-pyspark:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: scipy-notebook
-      image: pyspark-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-scipy]
-
-  aarch64-all-spark:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: pyspark-notebook
-      image: all-spark-notebook
-      platform: aarch64
-      runsOn: ARM64
-    needs: [aarch64-pyspark]
-    if: github.repository == 'jupyter/docker-stacks'
-
-  x86_64-all-spark:
-    uses: ./.github/workflows/docker-build-test-upload.yml
-    with:
-      parentImage: pyspark-notebook
-      image: all-spark-notebook
-      platform: x86_64
-      runsOn: ubuntu-latest
-    needs: [x86_64-pyspark]
-
   aarch64-images-tag-push:
     uses: ./.github/workflows/docker-tag-push.yml
     with:
@@ -250,32 +80,8 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     strategy:
       matrix:
-        image:
-          [
-            docker-stacks-foundation,
-            base-notebook,
-            minimal-notebook,
-            scipy-notebook,
-            r-notebook,
-            julia-notebook,
-            tensorflow-notebook,
-            datascience-notebook,
-            pyspark-notebook,
-            all-spark-notebook,
-          ]
-    needs:
-      [
-        aarch64-foundation,
-        aarch64-base,
-        aarch64-minimal,
-        aarch64-scipy,
-        aarch64-r,
-        aarch64-julia,
-        aarch64-tensorflow,
-        aarch64-datascience,
-        aarch64-pyspark,
-        aarch64-all-spark,
-      ]
+        image: [docker-stacks-foundation]
+    needs: [aarch64-foundation]
     if: github.repository == 'jupyter/docker-stacks'
 
   x86_64-images-tag-push:
@@ -288,32 +94,8 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     strategy:
       matrix:
-        image:
-          [
-            docker-stacks-foundation,
-            base-notebook,
-            minimal-notebook,
-            scipy-notebook,
-            r-notebook,
-            julia-notebook,
-            tensorflow-notebook,
-            datascience-notebook,
-            pyspark-notebook,
-            all-spark-notebook,
-          ]
-    needs:
-      [
-        x86_64-foundation,
-        x86_64-base,
-        x86_64-minimal,
-        x86_64-scipy,
-        x86_64-r,
-        x86_64-julia,
-        x86_64-tensorflow,
-        x86_64-datascience,
-        x86_64-pyspark,
-        x86_64-all-spark,
-      ]
+        image: [docker-stacks-foundation]
+    needs: [x86_64-foundation]
 
   merge-tags:
     uses: ./.github/workflows/docker-merge-tags.yml
@@ -324,19 +106,7 @@ jobs:
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
     strategy:
       matrix:
-        image:
-          [
-            docker-stacks-foundation,
-            base-notebook,
-            minimal-notebook,
-            scipy-notebook,
-            r-notebook,
-            julia-notebook,
-            tensorflow-notebook,
-            datascience-notebook,
-            pyspark-notebook,
-            all-spark-notebook,
-          ]
+        image: [docker-stacks-foundation]
     needs: [aarch64-images-tag-push, x86_64-images-tag-push]
     if: github.repository == 'jupyter/docker-stacks'
 

diff --git a/docs/using/recipe_code/generate_matrix.py b/docs/using/recipe_code/generate_matrix.py
@@ -12,8 +12,10 @@ def generate_matrix() -> dict[str, Any]:
     dockerfiles = sorted(file.name for file in THIS_DIR.glob("*.dockerfile"))
     return {
         "dockerfile": dockerfiles,
-        "runsOn": ["ubuntu-latest", "ARM64"],
-        "exclude": [{"dockerfile": "oracledb.dockerfile", "runsOn": "ARM64"}],
+        "runsOn": ["ubuntu-latest", "macos-latest-xlarge"],
+        "exclude": [
+            {"dockerfile": "oracledb.dockerfile", "runsOn": "macos-latest-xlarge"}
+        ],
     }