Skip to content

Commit 124edd5

Browse files
committed
turn ci information into tables
1 parent e60c843 commit 124edd5

File tree

2 files changed

+66
-34
lines changed

2 files changed

+66
-34
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ commands:
1717
export git_log=$(git log --max-count=1 --pretty=format:"%B" | tr "\n" " ")
1818
echo "Got commit message:"
1919
echo "${git_log}"
20-
if [[ -v CIRCLE_PULL_REQUEST ]] && ([[ "$git_log" == *"[skip circle]"* ]] || [[ "$git_log" == *"[circle skip]"* ]]); then
20+
if [[ -v CIRCLE_PULL_REQUEST ]] && [[ $git_log =~ (\[skip circle\]|\[circle skip\]|\[skip doc\]|\[doc skip\]) ]]; then
2121
echo "Skip detected, exiting job ${CIRCLE_JOB} for PR ${CIRCLE_PULL_REQUEST}."
2222
circleci-agent step halt;
2323
fi

doc/devel/development_workflow.rst

Lines changed: 65 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -464,42 +464,74 @@ Make sure the Linting, GitHub Actions, AppVeyor, CircleCI, and Azure pipelines a
464464
passing before merging. All checks are listed at the bottom of the GitHub page of your
465465
pull request.
466466

467-
Here are some tips for finding the cause of a test failure:
468-
469-
- If *Linting* fails, you have a code style issue, which will be listed
470-
as annotations on the pull request's diff.
471-
- If *Mypy* or *Stubtest* fails, you have inconsistency in type hints, which
472-
will be listed as annotations in the diff.
473-
- If a GitHub Actions or AppVeyor run fails, search the log for ``FAILURES``.
474-
The subsequent section will contain information on the failed tests.
475-
- If CircleCI fails, likely you have some reStructuredText style issue in
476-
the docs. Search the CircleCI log for ``WARNING``.
477-
- If Azure pipelines fail with an image comparison error, you can find the
478-
images as *artifacts* of the Azure job:
479-
480-
- Click *Details* on the check on the GitHub PR page.
481-
- Click *View more details on Azure Pipelines* to go to Azure.
482-
- On the overview page *artifacts* are listed in the section *Related*.
467+
.. list-table::
468+
:header-rows: 1
469+
:stub-columns: 1
470+
:widths: 20 15 65
471+
472+
* - name
473+
- scope
474+
- tips for finding cause of failure
475+
* - Linting
476+
- Code style
477+
- Errors are displayed as annotations on the pull request diff.
478+
* - | Mypy
479+
| Stubtest
480+
- Type hints
481+
- Errors are displayed as annotations on the pull request diff.
482+
* - CircleCI
483+
- reStructuredText (rst)
484+
- Search the CircleCI log for ``WARNING``.
485+
* - | GitHub Actions
486+
| AppVeyor
487+
| Azure pipelines
488+
- :ref:`tests <testing>`
489+
- | Search the log for ``FAILURES``. Subsequent section should contain information
490+
on failed tests.
491+
|
492+
| On Azure, find the images as *artifacts* of the Azure job:
493+
| 1. Click *Details* on the check on the GitHub PR page.
494+
| 2. Click *View more details on Azure Pipelines* to go to Azure.
495+
| 3. On the overview page *artifacts* are listed in the section *Related*.
483496
484497
Skip CI checks
485498
--------------
486499

487-
If you know only a subset of CIs need to be run, this can be controlled on individual
488-
commits by including the following substrings in commit messages:
489-
490-
- ``[ci doc]``: restrict the CI to documentation checks. For when you only changed
491-
documentation. This skip is automatic if the changes are only under
492-
``doc/`` or ``galleries/``.
493-
- ``[skip circle]``: skip the documentation build check. For when you didn't
494-
change documentation.
495-
- Unit tests can be turned off for individual platforms with:
496-
497-
- ``[skip actions]``: GitHub Actions
498-
- ``[skip appveyor]``: AppVeyor. Must be in the first line of the commit message.
499-
- ``[skip azp]``: Azure Pipelines
500-
501-
- ``[skip ci]``: skip all CIs. Use this only if you know your changes do not
502-
need to be tested at all. This only skips CI triggered on ``on: push`` and
503-
``on: pull_request`` events. For more information, see `Skipping workflow runs`_.
500+
If you know only a subset of CI checks need to be run, you can skip any unneeded CI
501+
checks on individual commits by including the following substrings in commit messages:
502+
503+
.. list-table::
504+
:header-rows: 1
505+
:stub-columns: 1
506+
:widths: 25 20 55
507+
508+
* - substring
509+
- effect
510+
- notes
511+
* - ``[ci doc]``
512+
- Only run documentation checks.
513+
- | For when you have only changed documentation.
514+
| ``[ci doc]`` is applied automatically when the changes are only to files in
515+
``doc/**/`` or ``galleries/**/``
516+
* - ``[skip doc]``
517+
- Skip documentation checks.
518+
- For when you didn't change documentation.
519+
* - ``[skip appveyor]``
520+
- Skip AppVeyor run.
521+
- Substring must be in first line of commit message.
522+
* - ``[skip azp]``
523+
- Skip Azure Pipelines.
524+
-
525+
* - ``[skip actions]``
526+
- Skip GitHub Actions
527+
-
528+
* - ``[skip ci]``
529+
- Skip all CI checks.
530+
- Use only for changes where documentation checks and unit tests do not apply.
531+
532+
533+
``[skip actions]`` and ``[skip ci]`` skip Github Actions CI workflows that are
534+
triggered on ``on: push`` and ``on: pull_request`` events. For more information,
535+
see `Skipping workflow runs`_.
504536

505537
.. _`Skipping workflow runs`: https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy