From f2250331180f0c6131589dda9ae50ed82cc88cf3 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 27 Aug 2024 13:16:09 -0400 Subject: [PATCH 01/18] Prune workflows based on changed files Only run tests based on things that have actually changed. For example, if only Python files have changed, we don't need to run the C++ tests. Contributes to https://github.com/rapidsai/build-planning/issues/94 --- .github/workflows/pr.yaml | 74 ++++++++++++++++++++++++++++++++++----- 1 file changed, 65 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index dacd9a93399..3cc0aef03fa 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -12,6 +12,7 @@ concurrency: jobs: pr-builder: needs: + - changed-files - checks - conda-cpp-build - conda-cpp-tests @@ -35,6 +36,52 @@ jobs: - devcontainer secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.10 + if: always() + with: + needs: ${{ toJSON(needs) }} + changed-files: + runs-on: ubuntu-latest + name: "Check changed files" + outputs: + test_cpp: ${{ steps.changed-files.outputs.cpp_any_changed == 'true' }} + test_notebooks: ${{ steps.changed-files.outputs.notebooks_any_changed == 'true' }} + test_python: ${{ steps.changed-files.outputs.python_any_changed == 'true' }} + steps: + - name: Get PR info + id: get-pr-info + uses: rapidsai/shared-actions/get-pr-info@main + - name: Checkout code repo + uses: actions/checkout@v4 + with: + ref: ${{ inputs.sha }} + fetch-depth: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).commits }} + persist-credentials: false + - name: Get changed files + id: changed-files + uses: tj-actions/changed-files@v45 + with: + base_sha: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }} + files_yaml: | + cpp: + - '**' + - '!docs/**' + - '!img/**' + - '!notebooks/**' + - '!python/**' + # TODO: Remove this before merging + - '!.github/**' + notebooks: + - '**' + - '!docs/**' + # TODO: Remove this before merging + - '!.github/**' + python: + - '**' + - '!docs/**' + - '!img/**' + - '!notebooks/**' + # TODO: Remove this before merging + - '!.github/**' checks: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 @@ -48,9 +95,10 @@ jobs: build_type: pull-request node_type: cpu32 conda-cpp-tests: - needs: conda-cpp-build + needs: [conda-cpp-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 + if: needs.changed-files.outputs.test_cpp == 'true' with: build_type: pull-request conda-cpp-checks: @@ -68,15 +116,17 @@ jobs: with: build_type: pull-request conda-python-tests: - needs: conda-python-build + needs: [conda-python-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request conda-notebook-tests: - needs: conda-python-build + needs: [conda-python-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + if: needs.changed-files.outputs.test_notebooks == 'true' with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -105,9 +155,10 @@ jobs: extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY node_type: cpu32 wheel-tests-pylibcugraph: - needs: wheel-build-pylibcugraph + needs: [wheel-build-pylibcugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request script: ci/test_wheel_pylibcugraph.sh @@ -122,9 +173,10 @@ jobs: extra-repo-sha: branch-24.10 extra-repo-deploy-key: CUGRAPH_OPS_SSH_PRIVATE_DEPLOY_KEY wheel-tests-cugraph: - needs: wheel-build-cugraph + needs: [wheel-build-cugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request script: ci/test_wheel_cugraph.sh @@ -136,9 +188,10 @@ jobs: build_type: pull-request script: ci/build_wheel_nx-cugraph.sh wheel-tests-nx-cugraph: - needs: wheel-build-nx-cugraph + needs: [wheel-build-nx-cugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request script: ci/test_wheel_nx-cugraph.sh @@ -150,9 +203,10 @@ jobs: build_type: pull-request script: ci/build_wheel_cugraph-dgl.sh wheel-tests-cugraph-dgl: - needs: wheel-build-cugraph-dgl + needs: [wheel-build-cugraph-dgl, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request script: ci/test_wheel_cugraph-dgl.sh @@ -165,9 +219,10 @@ jobs: build_type: pull-request script: ci/build_wheel_cugraph-pyg.sh wheel-tests-cugraph-pyg: - needs: wheel-build-cugraph-pyg + needs: [wheel-build-cugraph-pyg, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request script: ci/test_wheel_cugraph-pyg.sh @@ -179,9 +234,10 @@ jobs: build_type: pull-request script: ci/build_wheel_cugraph-equivariant.sh wheel-tests-cugraph-equivariant: - needs: wheel-build-cugraph-equivariant + needs: [wheel-build-cugraph-equivariant, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 + if: needs.changed-files.outputs.test_python == 'true' with: build_type: pull-request script: ci/test_wheel_cugraph-equivariant.sh From af357f90dce605ab1674335269c7f409535d5644 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 27 Aug 2024 13:20:14 -0400 Subject: [PATCH 02/18] Ignore README and CONTRIBUTING --- .github/workflows/pr.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3cc0aef03fa..fe4b7b0bc7e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -64,6 +64,8 @@ jobs: files_yaml: | cpp: - '**' + - '!CONTRIBUTING.md' + - '!README.md' - '!docs/**' - '!img/**' - '!notebooks/**' @@ -72,11 +74,15 @@ jobs: - '!.github/**' notebooks: - '**' + - '!CONTRIBUTING.md' + - '!README.md' - '!docs/**' # TODO: Remove this before merging - '!.github/**' python: - '**' + - '!CONTRIBUTING.md' + - '!README.md' - '!docs/**' - '!img/**' - '!notebooks/**' From ba4269a8777598475d7374b1e4bee0844b729d0a Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 27 Aug 2024 15:04:01 -0400 Subject: [PATCH 03/18] Ignore mg_utils and readme_pages for cpp --- .github/workflows/pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index fe4b7b0bc7e..4ab0ac327f4 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -68,8 +68,10 @@ jobs: - '!README.md' - '!docs/**' - '!img/**' + - '!mg_utils/**' - '!notebooks/**' - '!python/**' + - '!readme_pages/**' # TODO: Remove this before merging - '!.github/**' notebooks: From 23b72fd3ae61a7c789e6abe970a6708d2e6c319e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 16:31:05 -0400 Subject: [PATCH 04/18] Try shared workflow --- .github/workflows/pr.yaml | 106 +++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 59 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 4ab0ac327f4..c1a709660a2 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -40,56 +40,44 @@ jobs: with: needs: ${{ toJSON(needs) }} changed-files: - runs-on: ubuntu-latest - name: "Check changed files" - outputs: - test_cpp: ${{ steps.changed-files.outputs.cpp_any_changed == 'true' }} - test_notebooks: ${{ steps.changed-files.outputs.notebooks_any_changed == 'true' }} - test_python: ${{ steps.changed-files.outputs.python_any_changed == 'true' }} - steps: - - name: Get PR info - id: get-pr-info - uses: rapidsai/shared-actions/get-pr-info@main - - name: Checkout code repo - uses: actions/checkout@v4 - with: - ref: ${{ inputs.sha }} - fetch-depth: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).commits }} - persist-credentials: false - - name: Get changed files - id: changed-files - uses: tj-actions/changed-files@v45 - with: - base_sha: ${{ fromJSON(steps.get-pr-info.outputs.pr-info).base.sha }} - files_yaml: | - cpp: - - '**' - - '!CONTRIBUTING.md' - - '!README.md' - - '!docs/**' - - '!img/**' - - '!mg_utils/**' - - '!notebooks/**' - - '!python/**' - - '!readme_pages/**' - # TODO: Remove this before merging - - '!.github/**' - notebooks: - - '**' - - '!CONTRIBUTING.md' - - '!README.md' - - '!docs/**' - # TODO: Remove this before merging - - '!.github/**' - python: - - '**' - - '!CONTRIBUTING.md' - - '!README.md' - - '!docs/**' - - '!img/**' - - '!notebooks/**' - # TODO: Remove this before merging - - '!.github/**' + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@changed-files + with: + files_yaml: | + cpp: + - '**' + - '!CONTRIBUTING.md' + - '!README.md' + - '!docs/**' + - '!img/**' + - '!mg_utils/**' + - '!notebooks/**' + - '!python/**' + - '!readme_pages/**' + # TODO: Remove this before merging + - '!.github/**' + notebooks: + - '**' + - '!CONTRIBUTING.md' + - '!README.md' + - '!docs/**' + # TODO: Remove this before merging + - '!.github/**' + python: + - '**' + - '!CONTRIBUTING.md' + - '!README.md' + - '!docs/**' + - '!img/**' + - '!notebooks/**' + # TODO: Remove this before merging + - '!.github/**' + transform_expr: | + { + "test_cpp": .cpp_any_changed, + "test_notebooks": .notebooks_any_changed, + "test_python": .python_any_changed, + } checks: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 @@ -106,7 +94,7 @@ jobs: needs: [conda-cpp-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - if: needs.changed-files.outputs.test_cpp == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_cpp with: build_type: pull-request conda-cpp-checks: @@ -127,14 +115,14 @@ jobs: needs: [conda-python-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request conda-notebook-tests: needs: [conda-python-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - if: needs.changed-files.outputs.test_notebooks == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_notebooks with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -166,7 +154,7 @@ jobs: needs: [wheel-build-pylibcugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request script: ci/test_wheel_pylibcugraph.sh @@ -184,7 +172,7 @@ jobs: needs: [wheel-build-cugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request script: ci/test_wheel_cugraph.sh @@ -199,7 +187,7 @@ jobs: needs: [wheel-build-nx-cugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request script: ci/test_wheel_nx-cugraph.sh @@ -214,7 +202,7 @@ jobs: needs: [wheel-build-cugraph-dgl, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request script: ci/test_wheel_cugraph-dgl.sh @@ -230,7 +218,7 @@ jobs: needs: [wheel-build-cugraph-pyg, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request script: ci/test_wheel_cugraph-pyg.sh @@ -245,7 +233,7 @@ jobs: needs: [wheel-build-cugraph-equivariant, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: needs.changed-files.outputs.test_python == 'true' + if: fromJSON(needs.changed-files.outputs.transformed_output).test_python with: build_type: pull-request script: ci/test_wheel_cugraph-equivariant.sh From 619fda4dcefb6e611157c72be8ea47522c666729 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 16:35:19 -0400 Subject: [PATCH 05/18] Re-run CI From 28c8eae7488d2f02bda852c7eac5636e0cbb29b8 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 16:41:33 -0400 Subject: [PATCH 06/18] == "true" --- .github/workflows/pr.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index c1a709660a2..f0d5edc6c48 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -74,9 +74,9 @@ jobs: - '!.github/**' transform_expr: | { - "test_cpp": .cpp_any_changed, - "test_notebooks": .notebooks_any_changed, - "test_python": .python_any_changed, + "test_cpp": .cpp_any_changed == "true", + "test_notebooks": .notebooks_any_changed == "true", + "test_python": .python_any_changed == "true", } checks: secrets: inherit From 2e507be334ed3fb0b74c43b161b8b13a0dc22d1e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 16:43:36 -0400 Subject: [PATCH 07/18] Parentheses --- .github/workflows/pr.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index f0d5edc6c48..05609953182 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -74,9 +74,9 @@ jobs: - '!.github/**' transform_expr: | { - "test_cpp": .cpp_any_changed == "true", - "test_notebooks": .notebooks_any_changed == "true", - "test_python": .python_any_changed == "true", + "test_cpp": (.cpp_any_changed == "true"), + "test_notebooks": (.notebooks_any_changed == "true"), + "test_python": (.python_any_changed == "true"), } checks: secrets: inherit From fb91dcc8a06adb8cc93096f10ba6edbd280a486a Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 16:46:03 -0400 Subject: [PATCH 08/18] Change notebook and force it to fail --- notebooks/algorithms/structure/Renumber.ipynb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/notebooks/algorithms/structure/Renumber.ipynb b/notebooks/algorithms/structure/Renumber.ipynb index b6cca6591d7..d23b72db4db 100755 --- a/notebooks/algorithms/structure/Renumber.ipynb +++ b/notebooks/algorithms/structure/Renumber.ipynb @@ -57,7 +57,10 @@ "import pandas as pd\n", "import numpy as np\n", "import networkx as nx\n", - "from cugraph.structure import NumberMap" + "from cugraph.structure import NumberMap\n", + "\n", + "# Force this notebook to fail\n", + "exit(1)" ] }, { From 7bbec5df94a3553e55a3ea93b1e8f95fb34db337 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 16:48:58 -0400 Subject: [PATCH 09/18] Add TODO --- notebooks/algorithms/structure/Renumber.ipynb | 1 + 1 file changed, 1 insertion(+) diff --git a/notebooks/algorithms/structure/Renumber.ipynb b/notebooks/algorithms/structure/Renumber.ipynb index d23b72db4db..4fee55984b7 100755 --- a/notebooks/algorithms/structure/Renumber.ipynb +++ b/notebooks/algorithms/structure/Renumber.ipynb @@ -60,6 +60,7 @@ "from cugraph.structure import NumberMap\n", "\n", "# Force this notebook to fail\n", + "# TODO: Remove this before merging\n", "exit(1)" ] }, From b06fb5d82fe0f350939497546a831e94f5c431cd Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 30 Aug 2024 18:52:58 -0400 Subject: [PATCH 10/18] Use default transform_expr --- .github/workflows/pr.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 05609953182..861afb3b330 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -72,12 +72,6 @@ jobs: - '!notebooks/**' # TODO: Remove this before merging - '!.github/**' - transform_expr: | - { - "test_cpp": (.cpp_any_changed == "true"), - "test_notebooks": (.notebooks_any_changed == "true"), - "test_python": (.python_any_changed == "true"), - } checks: secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 From 66bbd965ac62cc0ceef951a12bf739dc63f82c52 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Sat, 31 Aug 2024 11:20:26 -0400 Subject: [PATCH 11/18] Change naming convention --- .github/workflows/pr.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 861afb3b330..3d6df1ceb38 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -44,7 +44,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@changed-files with: files_yaml: | - cpp: + test_cpp: - '**' - '!CONTRIBUTING.md' - '!README.md' @@ -56,14 +56,14 @@ jobs: - '!readme_pages/**' # TODO: Remove this before merging - '!.github/**' - notebooks: + test_notebooks: - '**' - '!CONTRIBUTING.md' - '!README.md' - '!docs/**' # TODO: Remove this before merging - '!.github/**' - python: + test_python: - '**' - '!CONTRIBUTING.md' - '!README.md' From 428843f89469ca1058130d9e50479e3f7216dddb Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 16 Sep 2024 10:45:26 -0400 Subject: [PATCH 12/18] Change output name --- .github/workflows/pr.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 3d6df1ceb38..a2a91d1794b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -88,7 +88,7 @@ jobs: needs: [conda-cpp-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_cpp + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_cpp with: build_type: pull-request conda-cpp-checks: @@ -109,14 +109,14 @@ jobs: needs: [conda-python-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request conda-notebook-tests: needs: [conda-python-build, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_notebooks + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_notebooks with: build_type: pull-request node_type: "gpu-v100-latest-1" @@ -148,7 +148,7 @@ jobs: needs: [wheel-build-pylibcugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request script: ci/test_wheel_pylibcugraph.sh @@ -166,7 +166,7 @@ jobs: needs: [wheel-build-cugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request script: ci/test_wheel_cugraph.sh @@ -181,7 +181,7 @@ jobs: needs: [wheel-build-nx-cugraph, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request script: ci/test_wheel_nx-cugraph.sh @@ -196,7 +196,7 @@ jobs: needs: [wheel-build-cugraph-dgl, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request script: ci/test_wheel_cugraph-dgl.sh @@ -212,7 +212,7 @@ jobs: needs: [wheel-build-cugraph-pyg, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request script: ci/test_wheel_cugraph-pyg.sh @@ -227,7 +227,7 @@ jobs: needs: [wheel-build-cugraph-equivariant, changed-files] secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/wheels-test.yaml@branch-24.10 - if: fromJSON(needs.changed-files.outputs.transformed_output).test_python + if: fromJSON(needs.changed-files.outputs.changed_file_groups).test_python with: build_type: pull-request script: ci/test_wheel_cugraph-equivariant.sh From 694f602e3ccd56d7311cdf1634fe530ab8dde39e Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 16 Sep 2024 17:51:51 -0400 Subject: [PATCH 13/18] Add note --- .github/workflows/pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index a7f8ddaa31d..b1ee3e47c94 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -41,6 +41,8 @@ jobs: needs: ${{ toJSON(needs) }} changed-files: secrets: inherit + # TODO: Change this back to @branch-24.10 once + # https://github.com/rapidsai/shared-workflows/pull/239 is merged uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@changed-files with: files_yaml: | From ca2030842d4245b0154c2854c528c1d5ff558cd3 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Mon, 16 Sep 2024 17:55:35 -0400 Subject: [PATCH 14/18] Remove temporary failure --- notebooks/algorithms/structure/Renumber.ipynb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/notebooks/algorithms/structure/Renumber.ipynb b/notebooks/algorithms/structure/Renumber.ipynb index 4fee55984b7..b6cca6591d7 100755 --- a/notebooks/algorithms/structure/Renumber.ipynb +++ b/notebooks/algorithms/structure/Renumber.ipynb @@ -57,11 +57,7 @@ "import pandas as pd\n", "import numpy as np\n", "import networkx as nx\n", - "from cugraph.structure import NumberMap\n", - "\n", - "# Force this notebook to fail\n", - "# TODO: Remove this before merging\n", - "exit(1)" + "from cugraph.structure import NumberMap" ] }, { From e2b561faf8b89a89a5b6b16da19f8b6bf462d78d Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 17 Sep 2024 14:45:41 -0400 Subject: [PATCH 15/18] Use main branch --- .github/workflows/pr.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b1ee3e47c94..e5a4e409cb5 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -41,9 +41,7 @@ jobs: needs: ${{ toJSON(needs) }} changed-files: secrets: inherit - # TODO: Change this back to @branch-24.10 once - # https://github.com/rapidsai/shared-workflows/pull/239 is merged - uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@changed-files + uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@python-3.12 with: files_yaml: | test_cpp: From cb335e1ed62ce57778fed6996df541245545275b Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Tue, 17 Sep 2024 14:47:20 -0400 Subject: [PATCH 16/18] Switch to branch-24.10 --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e5a4e409cb5..bb8b28c247f 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -41,7 +41,7 @@ jobs: needs: ${{ toJSON(needs) }} changed-files: secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@python-3.12 + uses: rapidsai/shared-workflows/.github/workflows/changed-files.yaml@branch-24.10 with: files_yaml: | test_cpp: From d0d970edc2b88229084a1d9a0491fbf1ebbc460c Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Wed, 18 Sep 2024 13:31:59 -0400 Subject: [PATCH 17/18] Re-run CI From a70959a44cd2b9b6f266757152ea02dda4d9de95 Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Thu, 26 Sep 2024 16:56:52 -0400 Subject: [PATCH 18/18] Ignore .devcontainers changes --- .github/workflows/pr.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 208a04ba750..b0a1308237e 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -46,6 +46,7 @@ jobs: files_yaml: | test_cpp: - '**' + - '!.devcontainers/**' - '!CONTRIBUTING.md' - '!README.md' - '!docs/**' @@ -58,6 +59,7 @@ jobs: - '!.github/**' test_notebooks: - '**' + - '!.devcontainers/**' - '!CONTRIBUTING.md' - '!README.md' - '!docs/**' @@ -65,6 +67,7 @@ jobs: - '!.github/**' test_python: - '**' + - '!.devcontainers/**' - '!CONTRIBUTING.md' - '!README.md' - '!docs/**'