From 61b0c5a2a786da9e19c1d6e713cf49bf01cd1699 Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Fri, 3 Feb 2023 07:52:25 -0800 Subject: [PATCH 1/3] BLD: only doc CI build --- .circleci/config.yml | 2 +- .github/workflows/cygwin.yml | 1 + .github/workflows/tests.yml | 2 +- azure-pipelines.yml | 2 +- doc/devel/coding_guide.rst | 2 ++ 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d79f244e052c..d5427a77e164 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ commands: export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ") echo "Got commit message:" echo "${git_log}" - if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]]); then + if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]] [[ "$git_log" == *"[ci doc]"* ]])); then echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}." circleci-agent step halt; fi diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml index cb68e16d5518..d28c706b4057 100644 --- a/.github/workflows/cygwin.yml +++ b/.github/workflows/cygwin.yml @@ -57,6 +57,7 @@ jobs: !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]') && + !contains(github.event.head_commit.message, '[ci doc]') && ( github.event_name == 'push' || github.event_name == 'pull_request' && diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e13149118a52..3479beb44faa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ env: jobs: test: - if: "github.event_name == 'workflow_dispatch' || github.repository == 'matplotlib/matplotlib' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]')" + if: "github.event_name == 'workflow_dispatch' || github.repository == 'matplotlib/matplotlib' && !contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[skip github]' && !contains(github.event.head_commit.message, '[ci doc]')" permissions: contents: read name: "Python ${{ matrix.python-version }} on ${{ matrix.os }} ${{ matrix.name-suffix }}" diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f886405b605f..902669eb22fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -27,7 +27,7 @@ stages: git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "` echo "##vso[task.setvariable variable=log]$git_log" - bash: echo "##vso[task.setvariable variable=RET]false" - condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]')) + condition: or(contains(variables.log, '[skip azp]'), contains(variables.log, '[azp skip]'), contains(variables.log, '[skip ci]'), contains(variables.log, '[ci skip]'), contains(variables.log, '[ci doc]')) - bash: echo "##vso[task.setvariable variable=start_main;isOutput=true]$RET" name: result diff --git a/doc/devel/coding_guide.rst b/doc/devel/coding_guide.rst index d584a1c986e7..0bbe78eb390a 100644 --- a/doc/devel/coding_guide.rst +++ b/doc/devel/coding_guide.rst @@ -373,6 +373,8 @@ will run on all supported platforms and versions of Python. - Azure Pipelines: ``[skip azp]`` - CircleCI: ``[skip circle]`` + If you only want to run documentation CI you can pass ``[ci doc]``. + .. _pr-squashing: Number of commits and squashing From 93430c577e56a502fa811f937073f770038b39fd Mon Sep 17 00:00:00 2001 From: Jody Klymak Date: Fri, 3 Feb 2023 09:05:29 -0800 Subject: [PATCH 2/3] FIX --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d5427a77e164..d79f244e052c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,7 +17,7 @@ commands: export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ") echo "Got commit message:" echo "${git_log}" - if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]] [[ "$git_log" == *"[ci doc]"* ]])); then + if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]]); then echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}." circleci-agent step halt; fi From 46e3712a194b8717e51e6e843729a298496007a7 Mon Sep 17 00:00:00 2001 From: Kyle Sunden Date: Fri, 3 Feb 2023 15:36:41 -0600 Subject: [PATCH 3/3] I think this should actually test it [ci doc]