Merge branch 'branch-24.08' into cuda-12.5.1

jameslamb · web-flow · commit 58af07adaebf · 2024-07-19T13:10:56.000-05:00
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -86,7 +86,7 @@ jobs:
           driver: docker
           endpoint: builders
       - name: Build base image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: context
           file: Dockerfile
@@ -102,7 +102,7 @@ jobs:
             RAPIDS_VER=${{ inputs.RAPIDS_VER }}
           tags: ${{ inputs.BASE_TAG }}-${{ matrix.ARCH }}
       - name: Build notebooks image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: context
           file: Dockerfile
@@ -118,7 +118,7 @@ jobs:
             RAPIDS_VER=${{ inputs.RAPIDS_VER }}
           tags: ${{ inputs.NOTEBOOKS_TAG }}-${{ matrix.ARCH }}
       - name: Build RAFT ANN Benchmarks GPU image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: context
           file: raft-ann-bench/gpu/Dockerfile
@@ -132,7 +132,7 @@ jobs:
             RAPIDS_VER=${{ inputs.RAPIDS_VER }}
           tags: ${{ inputs.RAFT_ANN_BENCH_TAG }}-${{ matrix.ARCH }}
       - name: Build RAFT ANN Benchmarks GPU with datasets image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: context
           file: raft-ann-bench/gpu/Dockerfile
@@ -146,8 +146,8 @@ jobs:
             RAPIDS_VER=${{ inputs.RAPIDS_VER }}
           tags: ${{ inputs.RAFT_ANN_BENCH_DATASETS_TAG }}-${{ matrix.ARCH }}
       - name: Build RAFT ANN Benchmarks CPU image
-        if: inputs.CUDA_VER == '12.5.0' # we don't need to build CPU packages for different CUDA versions.
-        uses: docker/build-push-action@v5
+        if: inputs.CUDA_VER == '12.5.1' # we don't need to build CPU packages for different CUDA versions.
+        uses: docker/build-push-action@v6
         with:
           context: context
           file: raft-ann-bench/cpu/Dockerfile
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -10,6 +10,12 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  pr-builder:
+    needs:
+      - checks
+      - docker
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.08
   checks:
     runs-on: ubuntu-latest
     steps:
diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ EOF
 
 
 # Base image
-FROM rapidsai/miniforge-cuda:cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} as base
+FROM rapidsai/miniforge-cuda:cuda${CUDA_VER}-base-${LINUX_VER}-py${PYTHON_VER} AS base
 ARG CUDA_VER
 ARG PYTHON_VER
 
@@ -67,7 +67,7 @@ CMD ["ipython"]
 
 
 # Notebooks image
-FROM base as notebooks
+FROM base AS notebooks
 
 ARG CUDA_VER
 ARG LINUX_DISTRO
diff --git a/context/test_notebooks.py b/context/test_notebooks.py
@@ -70,6 +70,7 @@ def test_notebook(notebook_file, executed_nb_file):
         warnings = []
         outputs = []
 
+
         # use nbconvert to run the notebook natively
         ep = ExecutePreprocessor(timeout=600, kernel_name="python3", allow_errors=True)
         task_init = timeit.default_timer()
