From 5226133c59d317573f89df52262fa692dc560870 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Tue, 19 Dec 2023 10:25:48 -0800 Subject: [PATCH 1/3] Optionally skip the CI pipeline if the PR contains the skip-ci label --- .github/workflows/pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1ada0ea1b..2e7b85024 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -70,11 +70,13 @@ jobs: is_main_branch: ${{ github.ref_name == 'main' }} is_dev_branch: ${{ startsWith(github.ref_name, 'branch-') }} has_conda_build_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'conda-build') || false }} + has_skip_ci_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'skip-ci') || false }} pr_info: ${{ steps.get-pr-info.outcome == 'success' && steps.get-pr-info.outputs.pr-info || '' }} ci_pipe: name: CI Pipeline needs: [prepare] uses: ./.github/workflows/ci_pipe.yml + if: ${{ ! fromJSON(needs.prepare.outputs.has_skip_ci_label) }} with: # Run checks for any PR branch run_check: ${{ fromJSON(needs.prepare.outputs.is_pr) }} From c0d9f3ea72f7b5663a9e600ba420fe75c5f058a1 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Tue, 19 Dec 2023 10:30:49 -0800 Subject: [PATCH 2/3] Skip checks as well --- .github/workflows/pr.yaml | 12 +++++++----- mrc.code-workspace | 8 +++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 2e7b85024..d853a358a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -50,11 +50,6 @@ jobs: - ci_pipe secrets: inherit uses: rapidsai/shared-workflows/.github/workflows/pr-builder.yaml@branch-24.02 - checks: - secrets: inherit - uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 - with: - enable_check_generated_files: false prepare: name: Prepare runs-on: ubuntu-latest @@ -72,6 +67,13 @@ jobs: has_conda_build_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'conda-build') || false }} has_skip_ci_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'skip-ci') || false }} pr_info: ${{ steps.get-pr-info.outcome == 'success' && steps.get-pr-info.outputs.pr-info || '' }} + checks: + needs: [prepare] + if: ${{ ! fromJSON(needs.prepare.outputs.has_skip_ci_label) }} + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 + with: + enable_check_generated_files: false ci_pipe: name: CI Pipeline needs: [prepare] diff --git a/mrc.code-workspace b/mrc.code-workspace index 30e2eec34..ba738ce1c 100644 --- a/mrc.code-workspace +++ b/mrc.code-workspace @@ -187,12 +187,12 @@ "editor.semanticHighlighting.enabled": true, "editor.suggest.insertMode": "replace", "editor.tabSize": 4, - "editor.wordBasedSuggestions": false, + "editor.wordBasedSuggestions": "off", "editor.wordWrapColumn": 120 }, "[python]": { "editor.codeActionsOnSave": { - "source.organizeImports": true + "source.organizeImports": "explicit" }, "editor.formatOnSave": true, "editor.tabSize": 4 @@ -202,7 +202,9 @@ "-DMRC_PYTHON_INPLACE_BUILD:BOOL=ON" // Allow inplace build for python. Use `pip install -e .` from the python folder to install ], "cmake.format.allowOptionalArgumentIndentation": true, - "editor.rulers": [120], + "editor.rulers": [ + 120 + ], "files.insertFinalNewline": true, "files.trimTrailingWhitespace": true, "files.watcherExclude": { From aac875a45735f0ada25d4f28e6533039949e91b4 Mon Sep 17 00:00:00 2001 From: David Gardner Date: Tue, 19 Dec 2023 10:33:24 -0800 Subject: [PATCH 3/3] Add blank lines for readability --- .github/workflows/pr.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d853a358a..1fd00f5a0 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -67,6 +67,7 @@ jobs: has_conda_build_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'conda-build') || false }} has_skip_ci_label: ${{ steps.get-pr-info.outcome == 'success' && contains(fromJSON(steps.get-pr-info.outputs.pr-info).labels.*.name, 'skip-ci') || false }} pr_info: ${{ steps.get-pr-info.outcome == 'success' && steps.get-pr-info.outputs.pr-info || '' }} + checks: needs: [prepare] if: ${{ ! fromJSON(needs.prepare.outputs.has_skip_ci_label) }} @@ -74,6 +75,7 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.02 with: enable_check_generated_files: false + ci_pipe: name: CI Pipeline needs: [prepare]