[CI] First build Base and Build images, then Intel Drivers

Author: lukaszstolarczuk

.github/workflows/sycl-containers.yaml

@@ -26,7 +26,8 @@ on:
 permissions: read-all
 
 jobs:
-  build_and_push_images:
+  # First build "Base" and "Build" images
+  build_and_push_non_intel_images:
     if: github.repository == 'intel/llvm'
     name: "Containers"
     runs-on: ubuntu-latest
@@ -51,6 +52,35 @@ jobs:
             file: ubuntu2404_build
             tag: latest
             build_args: ""
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 2
+      - name: Build and Push Container
+        uses: ./devops/actions/build_container
+        with:
+          push: ${{ github.event_name != 'pull_request' }}
+          file: ${{ matrix.file }}
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+          tags: |
+            ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}-${{ github.sha }}
+            ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}
+          build-args: ${{ matrix.build_args }}
+
+  # Then build "Intel Drivers" images that depend on previous images.
+  # Note: Building these images on PR means using old "Base" and "Build" images,
+  # as the ones above were not yet pushed.
+  build_and_push_intel_images:
+    needs: build_and_push_non_intel_images
+    name: "Containers"
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        include:
           - name: Intel Drivers Ubuntu 22.04 Docker image
             file: ubuntu2204_intel_drivers
             tag: latest
@@ -87,4 +117,3 @@ jobs:
             ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}-${{ github.sha }}
             ghcr.io/${{ github.repository }}/${{ matrix.file }}:${{ matrix.tag }}
           build-args: ${{ matrix.build_args }}
-