[librsvg: 1/2] Rename references to the master branch to main
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 1/2] Rename references to the master branch to main
- Date: Tue, 28 Sep 2021 21:50:12 +0000 (UTC)
commit bfbf12774d67615fe6c49e8a4a54ee003ace400d
Author: Federico Mena Quintero <federico gnome org>
Date: Tue Sep 28 16:37:16 2021 -0500
Rename references to the master branch to main
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/594>
.gitlab-ci.yml | 8 ++++----
CONTRIBUTING.md | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c34959a0..91867e49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,15 +137,15 @@ cargo_bench:
sudo -E git checkout ${CI_DEFAULT_BRANCH}
for BENCH in "${BENCHES[@]}"
do
- sudo -E cargo bench --bench $BENCH -- --noplot --save-baseline master
+ sudo -E cargo bench --bench $BENCH -- --noplot --save-baseline main
done
sudo -E git checkout ${CI_COMMIT_SHA}
for BENCH in "${BENCHES[@]}"
do
- sudo -E cargo bench --bench $BENCH -- --noplot --baseline master
+ sudo -E cargo bench --bench $BENCH -- --noplot --baseline main
done
rules:
- - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "master"'
+ - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != "main"'
when: manual
allow_failure: true
artifacts:
@@ -241,4 +241,4 @@ pages:
paths:
- public
rules:
- - if: '$CI_COMMIT_BRANCH == "master"'
+ - if: '$CI_COMMIT_BRANCH == "main"'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 078dbb1c..3a9b3dea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ the web interface here:
https://gitlab.gnome.org/GNOME/librsvg
-Development happens in the master branch. There are also branches for
+Development happens in the `main` branch. There are also branches for
stable releases.
Alternatively, you can use the mirror at Github:
@@ -293,4 +293,4 @@ interesting options to generate plots and such. You can see the
[benches]: rsvg-internals/benches
[Criterion]: https://crates.io/crates/criterion
[criterion-options]: https://japaric.github.io/criterion.rs/book/user_guide/command_line_options.html
-[docker-tests-readme]: tools/docker/README.md
\ No newline at end of file
+[docker-tests-readme]: tools/docker/README.md
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]