From da68ad393c8ca7ce8cd0241b0dd5979e55c422c0 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 2 Feb 2024 09:12:42 +0100
Subject: [PATCH 1/2] Enable subset of image builds in PRs

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 .github/workflows/image.yaml | 47 +++++++++++++++++++++++++++++-------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index 588c6614..cc1ee275 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -16,6 +16,13 @@
 name: image
 
 on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+    branches:
+      - main
+      - release-*
   push:
     branches:
       - main
@@ -26,13 +33,24 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        package:
+        target:
           - ubuntu18.04-arm64
           - ubuntu18.04-amd64
           - ubuntu18.04-ppc64le
           - centos7-aarch64
           - centos7-x86_64
           - centos8-ppc64le
+        ispr:
+          - ${{github.event_name == 'pull_request'}}
+        exclude:
+          - ispr: true
+            target: ubuntu18.04-arm64
+          - ispr: true
+            target: ubuntu18.04-ppc64le
+          - ispr: true
+            target: centos7-aarch64
+          - ispr: true
+            target: centos8-ppc64le
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -41,23 +59,34 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: build ${{ matrix.package }} packages
+      - name: build ${{ matrix.target }} packages
         run: |
           sudo apt-get install -y coreutils build-essential sed git bash make
           echo "Building packages"
-          ./scripts/build-packages.sh ${{ matrix.package }}
+          ./scripts/build-packages.sh ${{ matrix.target }}
       - name: 'Upload Artifacts'
         uses: actions/upload-artifact@v4
         with:
           compression-level: 0
-          name: toolkit-container-${{ matrix.package }}-${{ github.run_id }}
+          name: toolkit-container-${{ matrix.target }}-${{ github.run_id }}
           path: ${{ github.workspace }}/dist/*
 
   image:
     runs-on: ubuntu-latest
     strategy:
-      matrix: 
-        image: [ubuntu20.04, centos7, ubi8, packaging]
+      matrix:
+        dist:
+          - ubuntu20.04
+          - centos7
+          - ubi8
+          - packaging
+        ispr:
+          - ${{github.event_name == 'pull_request'}}
+        exclude:
+          - ispr: true
+            dist: ubi8
+          - ispr: true
+            dist: centos7
     needs: packages
     steps:
       - uses: actions/checkout@v4
@@ -70,7 +99,7 @@ jobs:
           REPO_FULL_NAME="${{ github.event.pull_request.head.repo.full_name }}"
           echo "${REPO_FULL_NAME}"
           echo "LABEL_IMAGE_SOURCE=https://github.com/${REPO_FULL_NAME}" >> $GITHUB_ENV
-          
+
           GENERATE_ARTIFACTS="false"
           if [[ "${{ github.actor }}" == "dependabot[bot]" ]]; then
             GENERATE_ARTIFACTS="false"
@@ -90,7 +119,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ${{ github.workspace }}/dist/
-          pattern: toolkit-container-*
+          pattern: toolkit-container-*-${{ github.run_id }}
           merge-multiple: true
 
       - name: Login to GitHub Container Registry
@@ -105,4 +134,4 @@ jobs:
           VERSION: ${COMMIT_SHORT_SHA}
         run: |
           echo "${VERSION}"
-          make -f build/container/Makefile build-${{ matrix.image }}
+          make -f build/container/Makefile build-${{ matrix.dist }}

From 0bf08085ce2240ce5a4dfe645fd6422b87439ad7 Mon Sep 17 00:00:00 2001
From: Evan Lezar <elezar@nvidia.com>
Date: Fri, 2 Feb 2024 09:21:54 +0100
Subject: [PATCH 2/2] Update libnvidia-container

Signed-off-by: Evan Lezar <elezar@nvidia.com>
---
 third_party/libnvidia-container | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/third_party/libnvidia-container b/third_party/libnvidia-container
index f142020f..31c58490 160000
--- a/third_party/libnvidia-container
+++ b/third_party/libnvidia-container
@@ -1 +1 @@
-Subproject commit f142020f70f8653d34884f0ecb50e6c0078b34d4
+Subproject commit 31c58490248068df28fee2619a4f50250de2bfd4