[meld/pages] Update website build for master -> main move
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld/pages] Update website build for master -> main move
- Date: Wed, 21 Sep 2022 21:14:09 +0000 (UTC)
commit 04c0baa33c6c673e431419b8aa2e2b657c1192ca
Author: Kai Willadsen <kai willadsen gmail com>
Date: Thu Sep 22 07:13:48 2022 +1000
Update website build for master -> main move
.gitlab-ci.yml | 2 +-
README.md | 2 +-
index.html | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18524890..ff739fd5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ pages:
script:
- dnf install -y $DEPENDENCIES
- jekyll build -d public/
- - git checkout master
+ - git checkout main
- mkdir public/help/
- yelp-build html -o public/help help/C
artifacts:
diff --git a/README.md b/README.md
index f4a931a1..921cd38f 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Build
The build process (see `.gitlab-ci.yml`) has three stages. The first stage
builds the actual site using Jekyll, outputting to the `public` folder. The
-second stage switches to the master branch and uses the Yelp build tool to
+second stage switches to the `main` branch and uses the Yelp build tool to
generate an HTML version of Meld's help, which is output to a `help` subfolder
under the existing `public` folder. This public folder is the artifact that is
then uploaded to the GitLab Pages site.
diff --git a/index.html b/index.html
index aabffa78..efa1ceff 100644
--- a/index.html
+++ b/index.html
@@ -95,7 +95,7 @@ copyright: 2021 Kai Willadsen
<div class="d-flex">
<i class="fas fa-cubes fa-2x fa-fw mr-3 mb-2"></i>
<p>
- Meld is packaged for most Linux/Unix distributions, and is also available on <a
href="https://flathub.org/">Flathub</a>. For installing from source, see the <a
href="https://gitlab.gnome.org/GNOME/meld/-/blob/master/README.md">instructions</a>.
+ Meld is packaged for most Linux/Unix distributions, and is also available on <a
href="https://flathub.org/">Flathub</a>. For installing from source, see the <a
href="https://gitlab.gnome.org/GNOME/meld/-/blob/main/README.md">instructions</a>.
</p>
</div>
<div class="d-flex">
@@ -123,7 +123,7 @@ copyright: 2021 Kai Willadsen
<li>pycairo</li>
</ul>
<p>
- See the current <a href="https://gitlab.gnome.org/GNOME/meld/-/blob/master/README.md">README
file</a> for development and build requirements.
+ See the current <a href="https://gitlab.gnome.org/GNOME/meld/-/blob/main/README.md">README
file</a> for development and build requirements.
</p>
</div>
</div>
@@ -179,7 +179,7 @@ $ bin/meld</pre>
</div>
<div class="col-sm-4 mt-1">Source view</div>
<div class="col-sm-8 mt-1">
- <a
href="https://gitlab.gnome.org/GNOME/meld/tree/master">https://gitlab.gnome.org/GNOME/meld/tree/master</a>
+ <a
href="https://gitlab.gnome.org/GNOME/meld/tree/main">https://gitlab.gnome.org/GNOME/meld/tree/main</a>
</div>
<div class="col-sm-4 mt-1">Issue tracker</div>
<div class="col-sm-8 mt-1">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]