Sort entries when reusing GitHub workflows

jupyter · Dec 10, 2022 · a4f53d1 · a4f53d1
1 parent 9d45f82
commit a4f53d1
Showing 1 changed file with 58 additions and 58 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -71,12 +71,12 @@ concurrency:
 jobs:
  aarch64-foundation:
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: ""
  image: docker-stacks-foundation
  platform: aarch64
  runsOn: ARM64
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-foundation:
  uses: ./.github/workflows/docker-build-test-upload.yml
@@ -87,152 +87,168 @@ jobs:
  runsOn: ubuntu-latest
 
  aarch64-base:
- needs: [aarch64-foundation]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: docker-stacks-foundation
  image: base-notebook
  platform: aarch64
  runsOn: ARM64
+ needs: [aarch64-foundation]
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-base:
- needs: [x86_64-foundation]
  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:
- needs: [aarch64-base]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: base-notebook
  image: minimal-notebook
  platform: aarch64
  runsOn: ARM64
+ needs: [aarch64-base]
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-minimal:
- needs: [x86_64-base]
  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:
- needs: [aarch64-minimal]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: minimal-notebook
  image: scipy-notebook
  platform: aarch64
  runsOn: ARM64
+ needs: [aarch64-minimal]
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-scipy:
- needs: [x86_64-minimal]
  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:
- needs: [aarch64-minimal]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: minimal-notebook
  image: r-notebook
  platform: aarch64
  runsOn: ARM64
+ needs: [aarch64-minimal]
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-r:
- needs: [x86_64-minimal]
  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]
 
  x86_64-tensorflow:
- needs: [x86_64-scipy]
  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:
- needs: [aarch64-scipy]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: scipy-notebook
  image: datascience-notebook
  platform: aarch64
  runsOn: ARM64
+ needs: [aarch64-scipy]
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-datascience:
- needs: [x86_64-scipy]
  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:
- needs: [aarch64-scipy]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  with:
  parentImage: scipy-notebook
  image: pyspark-notebook
  platform: aarch64
  runsOn: ARM64
+ needs: [aarch64-scipy]
+ if: github.repository == 'jupyter/docker-stacks'
 
  x86_64-pyspark:
- needs: [x86_64-scipy]
  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:
- needs: [aarch64-pyspark]
  uses: ./.github/workflows/docker-build-test-upload.yml
- if: github.repository == 'jupyter/docker-stacks'
  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:
- needs: [x86_64-pyspark]
  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:
- if: github.repository == 'jupyter/docker-stacks'
+ uses: ./.github/workflows/docker-tag-manifest-push.yml
+ with:
+ platform: aarch64
+ image: ${{ matrix.image }}
  secrets:
  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
  DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+ strategy:
+ matrix:
+ image:
+ [
+ docker-stacks-foundation,
+ base-notebook,
+ minimal-notebook,
+ scipy-notebook,
+ r-notebook,
+ datascience-notebook,
+ pyspark-notebook,
+ all-spark-notebook,
+ ]
  needs:
  [
  aarch64-foundation,
@@ -244,6 +260,16 @@ jobs:
  aarch64-pyspark,
  aarch64-all-spark,
  ]
+ if: github.repository == 'jupyter/docker-stacks'
+
+ x86_64-images-tag-push:
+ uses: ./.github/workflows/docker-tag-manifest-push.yml
+ with:
+ platform: x86_64
+ image: ${{ matrix.image }}
+ secrets:
+ DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+ DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
  strategy:
  matrix:
  image:
@@ -253,19 +279,11 @@ jobs:
  minimal-notebook,
  scipy-notebook,
  r-notebook,
+ tensorflow-notebook,
  datascience-notebook,
  pyspark-notebook,
  all-spark-notebook,
  ]
- uses: ./.github/workflows/docker-tag-manifest-push.yml
- with:
- platform: aarch64
- image: ${{ matrix.image }}
-
- x86_64-images-tag-push:
- secrets:
- DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
- DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
  needs:
  [
  x86_64-foundation,
@@ -278,30 +296,14 @@ jobs:
  x86_64-pyspark,
  x86_64-all-spark,
  ]
- strategy:
- matrix:
- image:
- [
- docker-stacks-foundation,
- base-notebook,
- minimal-notebook,
- scipy-notebook,
- r-notebook,
- tensorflow-notebook,
- datascience-notebook,
- pyspark-notebook,
- all-spark-notebook,
- ]
- uses: ./.github/workflows/docker-tag-manifest-push.yml
- with:
- platform: x86_64
- image: ${{ matrix.image }}
 
  merge-tags:
+ uses: ./.github/workflows/docker-merge-tags.yml
+ with:
+ image: ${{ matrix.image }}
  secrets:
  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
  DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
- needs: [aarch64-images-tag-push, x86_64-images-tag-push]
  strategy:
  matrix:
  image:
@@ -316,14 +318,12 @@ jobs:
  pyspark-notebook,
  all-spark-notebook,
  ]
- uses: ./.github/workflows/docker-merge-tags.yml
- with:
- image: ${{ matrix.image }}
+ needs: [aarch64-images-tag-push, x86_64-images-tag-push]
  if: github.repository == 'jupyter/docker-stacks'
 
  wiki-update:
- permissions:
- contents: write
- needs: [aarch64-images-tag-push, x86_64-images-tag-push]
  uses: ./.github/workflows/docker-wiki-update.yml
+ needs: [aarch64-images-tag-push, x86_64-images-tag-push]
  if: github.repository == 'jupyter/docker-stacks'
+ permissions:
+ contents: write