aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuilherme Janczak <guilherme.janczak@yandex.com>2022-05-27 00:05:55 +0000
committerEli Schwartz <eschwartz93@gmail.com>2022-05-26 20:47:39 -0400
commit3c66be0c1d61d7fa7b2fe163440624c838ea4d33 (patch)
tree336ca4b8d2c5605efdea390295e6e5443cc11d18
parentfda4c49c34f2650b739ebf741e45228c5ebafb0c (diff)
downloadmeson-3c66be0c1d61d7fa7b2fe163440624c838ea4d33.zip
meson-3c66be0c1d61d7fa7b2fe163440624c838ea4d33.tar.gz
meson-3c66be0c1d61d7fa7b2fe163440624c838ea4d33.tar.bz2
don't tell documentation contributors to skip CI
The CI correctly handles documentation changes automatically, it's no longer necessary to do it by hand.
-rw-r--r--docs/README.md8
-rw-r--r--docs/markdown/Contributing.md5
-rwxr-xr-xskip_ci.py3
3 files changed, 1 insertions, 15 deletions
diff --git a/docs/README.md b/docs/README.md
index 3a2626b..f6645d3 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -30,11 +30,3 @@ You can simply run:
```
$ ninja -C built_docs/ upload
```
-
-## Contributing to the documentation
-
-Commits that only change documentation should have `[skip ci]` in their commit message, so CI is not run (it is quite slow).
-For example:
-```
-A commit message [skip ci]
-```
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
index 3340b5c..17f4fd2 100644
--- a/docs/markdown/Contributing.md
+++ b/docs/markdown/Contributing.md
@@ -462,11 +462,6 @@ notes. These features should be written in standalone files in the
`docs/markdown/snippets` directory. The release manager will combine
them into one page when doing the release.
-[Integration tests should be disabled](#skipping-integration-tests) for
-documentation-only commits by putting `[skip ci]` into commit title.
-Reviewers should ask contributors to put `[skip ci]` into the title because
-tests are run again after merge for `master`.
-
## Python Coding style
Meson follows the basic Python coding style. Additional rules are the
diff --git a/skip_ci.py b/skip_ci.py
index 7411d57..4ade979 100755
--- a/skip_ci.py
+++ b/skip_ci.py
@@ -61,8 +61,7 @@ def main():
if args.base_branch_origin:
base = 'origin/' + base
if all(is_documentation(f) for f in get_git_files(base)):
- print("Don't run CI for documentation-only changes, add '[skip ci]' to commit title.")
- print('See http://mesonbuild.com/Contributing.html#skipping-integration-tests')
+ print("Documentation change, CI skipped.")
sys.exit(1)
except Exception:
# If this script fails we want build to proceed.