diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 1ada0ea1b..1fd00f5a0 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 @@ -70,11 +65,22 @@ 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 || '' }} + + 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] 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) }} 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": {