Revert changes to docs build scripts. (rapidsai#14377)

.github/workflows/build.yaml

@@ -55,7 +55,7 @@ jobs:
       skip_upload_pkgs: libcudf-example
   docs-build:
     if: github.ref_type == 'branch'
-    #needs: python-build
+    needs: python-build
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:

.github/workflows/pr.yaml

@@ -12,85 +12,85 @@ concurrency:
 jobs:
   pr-builder:
     needs:
-      #- checks
-      #- conda-cpp-build
-      #- conda-cpp-tests
-      #- conda-python-build
-      #- conda-python-cudf-tests
-      #- conda-python-other-tests
-      #- conda-java-tests
-      #- conda-notebook-tests
+      - checks
+      - conda-cpp-build
+      - conda-cpp-tests
+      - conda-python-build
+      - conda-python-cudf-tests
+      - conda-python-other-tests
+      - conda-java-tests
+      - conda-notebook-tests
       - docs-build
-      #- wheel-build-cudf
-      #- wheel-tests-cudf
-      #- wheel-build-dask-cudf
-      #- wheel-tests-dask-cudf
-      #- unit-tests-cudf-pandas
-      #- pandas-tests
+      - wheel-build-cudf
+      - wheel-tests-cudf
+      - wheel-build-dask-cudf
+      - wheel-tests-dask-cudf
+      - unit-tests-cudf-pandas
+      - pandas-tests
       #- pandas-tests-diff
       #- pandas-tests-diff-comment
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-# checks:
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     enable_check_generated_files: false
-# conda-cpp-build:
-#   needs: checks
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-# conda-cpp-tests:
-#   needs: conda-cpp-build
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-# conda-python-build:
-#   needs: conda-cpp-build
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-# conda-python-cudf-tests:
-#   needs: conda-python-build
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-#     test_script: "ci/test_python_cudf.sh"
-# conda-python-other-tests:
-#   # Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
-#   needs: conda-python-build
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-#     test_script: "ci/test_python_other.sh"
-# conda-java-tests:
-#   needs: conda-cpp-build
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-#     node_type: "gpu-v100-latest-1"
-#     arch: "amd64"
-#     container_image: "rapidsai/ci-conda:latest"
-#     run_script: "ci/test_java.sh"
-# conda-notebook-tests:
-#   needs: conda-python-build
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-#     node_type: "gpu-v100-latest-1"
-#     arch: "amd64"
-#     container_image: "rapidsai/ci-conda:latest"
-#     run_script: "ci/test_notebooks.sh"
+  checks:
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      enable_check_generated_files: false
+  conda-cpp-build:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+  conda-cpp-tests:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+  conda-python-build:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+  conda-python-cudf-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      test_script: "ci/test_python_cudf.sh"
+  conda-python-other-tests:
+    # Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      test_script: "ci/test_python_other.sh"
+  conda-java-tests:
+    needs: conda-cpp-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/test_java.sh"
+  conda-notebook-tests:
+    needs: conda-python-build
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      node_type: "gpu-v100-latest-1"
+      arch: "amd64"
+      container_image: "rapidsai/ci-conda:latest"
+      run_script: "ci/test_notebooks.sh"
   docs-build:
-    #needs: conda-python-build
+    needs: conda-python-build
     secrets: inherit
     uses: rapidsai/shared-workflows/.github/workflows/[email protected]
     with:
@@ -99,53 +99,53 @@ jobs:
       arch: "amd64"
       container_image: "rapidsai/ci-conda:latest"
       run_script: "ci/build_docs.sh"
-# wheel-build-cudf:
-#   needs: checks
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-#     script: "ci/build_wheel_cudf.sh"
-# wheel-tests-cudf:
-#   needs: wheel-build-cudf
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     build_type: pull-request
-#     script: ci/test_wheel_cudf.sh
-# wheel-build-dask-cudf:
-#   needs: wheel-tests-cudf
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
-#     build_type: pull-request
-#     script: "ci/build_wheel_dask_cudf.sh"
-# wheel-tests-dask-cudf:
-#   needs: wheel-build-dask-cudf
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
-#     build_type: pull-request
-#     script: ci/test_wheel_dask_cudf.sh
-# unit-tests-cudf-pandas:
-#   needs: wheel-build-cudf
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
-#     build_type: pull-request
-#     script: ci/cudf_pandas_scripts/run_tests.sh
-# pandas-tests:
-#   # run the Pandas unit tests using PR branch
-#   needs: wheel-build-cudf
-#   secrets: inherit
-#   uses: rapidsai/shared-workflows/.github/workflows/[email protected]
-#   with:
-#     matrix_filter: map(select(.ARCH == "amd64")) | max_by(.CUDA_VER) | [.]
-#     build_type: pull-request
-#     script: ci/cudf_pandas_scripts/pandas-tests/run.sh pr
+  wheel-build-cudf:
+    needs: checks
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      script: "ci/build_wheel_cudf.sh"
+  wheel-tests-cudf:
+    needs: wheel-build-cudf
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      build_type: pull-request
+      script: ci/test_wheel_cudf.sh
+  wheel-build-dask-cudf:
+    needs: wheel-tests-cudf
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
+      build_type: pull-request
+      script: "ci/build_wheel_dask_cudf.sh"
+  wheel-tests-dask-cudf:
+    needs: wheel-build-dask-cudf
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
+      build_type: pull-request
+      script: ci/test_wheel_dask_cudf.sh
+  unit-tests-cudf-pandas:
+    needs: wheel-build-cudf
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      matrix_filter: map(select(.ARCH == "amd64" and .PY_VER == "3.10" and (.CUDA_VER == "11.8.0" or .CUDA_VER == "12.0.1")))
+      build_type: pull-request
+      script: ci/cudf_pandas_scripts/run_tests.sh
+  pandas-tests:
+    # run the Pandas unit tests using PR branch
+    needs: wheel-build-cudf
+    secrets: inherit
+    uses: rapidsai/shared-workflows/.github/workflows/[email protected]
+    with:
+      matrix_filter: map(select(.ARCH == "amd64")) | max_by(.CUDA_VER) | [.]
+      build_type: pull-request
+      script: ci/cudf_pandas_scripts/pandas-tests/run.sh pr
   #pandas-tests-diff:
   #  # diff the results of running the Pandas unit tests and publish a job summary
   #  needs: [pandas-tests-main, pandas-tests-pr]

ci/build_docs.sh

@@ -16,16 +16,14 @@ conda activate docs
 
 rapids-print-env
 
-#rapids-logger "Downloading artifacts from previous jobs"
-#CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
-#PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
-#
-#rapids-mamba-retry install \
-#  --channel "${CPP_CHANNEL}" \
-#  --channel "${PYTHON_CHANNEL}" \
-#  libcudf cudf dask-cudf
+rapids-logger "Downloading artifacts from previous jobs"
+CPP_CHANNEL=$(rapids-download-conda-from-s3 cpp)
+PYTHON_CHANNEL=$(rapids-download-conda-from-s3 python)
+
 rapids-mamba-retry install \
-  libcudf=23.10 cudf=23.10 dask-cudf=23.10
+  --channel "${CPP_CHANNEL}" \
+  --channel "${PYTHON_CHANNEL}" \
+  libcudf cudf dask-cudf
 
 export RAPIDS_VERSION_NUMBER="23.10"
 export RAPIDS_DOCS_DIR="$(mktemp -d)"