[gnome-software: 1/3] docs: Use HEAD instead of master in various git URIs
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software: 1/3] docs: Use HEAD instead of master in various git URIs
- Date: Wed, 14 Jul 2021 11:45:02 +0000 (UTC)
commit 7b229c0bcd656768f79b111bad2390144f2fe1a9
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Jul 14 10:22:55 2021 +0100
docs: Use HEAD instead of master in various git URIs
GitLab automatically converts this to the default branch name, so the
URIs are now future-proof against these projects renaming their default
branch.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
Helps: #1318
.gitlab-ci.yml | 4 ++--
data/appdata/org.gnome.Software.appdata.xml.in | 10 +++++-----
lib/gs-appstream.c | 2 +-
lib/gs-odrs-provider.c | 2 +-
plugins/malcontent/gs-plugin-malcontent.c | 2 +-
src/gs-app-context-bar.c | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d3d8fdb1f..3323dae83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/master/flatpak/flatpak_ci_initiative.yml'
+include: 'https://gitlab.gnome.org/GNOME/citemplates/raw/HEAD/flatpak/flatpak_ci_initiative.yml'
stages:
- build
@@ -87,7 +87,7 @@ flatpak bundle:
when: manual
allow_failure: true
script:
- # Modified from
https://gitlab.gnome.org/GNOME/citemplates/-/blob/master/flatpak/flatpak_ci_initiative.yml
+ # Modified from https://gitlab.gnome.org/GNOME/citemplates/-/blob/HEAD/flatpak/flatpak_ci_initiative.yml
# to drop the unit tests, since we don’t need them
- rewrite-flatpak-manifest ${MANIFEST_PATH} ${FLATPAK_MODULE} ${CONFIG_OPTS}
- flatpak-builder --user --disable-rofiles-fuse flatpak_app --repo=repo
${BRANCH:+--default-branch=$BRANCH} ${MANIFEST_PATH}
diff --git a/data/appdata/org.gnome.Software.appdata.xml.in b/data/appdata/org.gnome.Software.appdata.xml.in
index 15eeded47..141a8bebf 100644
--- a/data/appdata/org.gnome.Software.appdata.xml.in
+++ b/data/appdata/org.gnome.Software.appdata.xml.in
@@ -21,23 +21,23 @@
</description>
<screenshots>
<screenshot height="675" width="1200" type="default">
- <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/master/data/appdata/ss-overview.png</image>
+ <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-overview.png</image>
<caption>Overview panel</caption>
</screenshot>
<screenshot height="675" width="1200">
- <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/master/data/appdata/ss-details.png</image>
+ <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-details.png</image>
<caption>Details panel</caption>
</screenshot>
<screenshot height="675" width="1200">
- <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/master/data/appdata/ss-installed.png</image>
+ <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-installed.png</image>
<caption>Installed panel</caption>
</screenshot>
<screenshot height="675" width="1200">
- <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/master/data/appdata/ss-updates.png</image>
+ <image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-updates.png</image>
<caption>Updates panel</caption>
</screenshot>
<screenshot height="675" width="1200">
-
<image>https://gitlab.gnome.org/GNOME/gnome-software/raw/master/data/appdata/ss-updates-details.png</image>
+
<image>https://gitlab.gnome.org/GNOME/gnome-software/raw/HEAD/data/appdata/ss-updates-details.png</image>
<caption>The update details</caption>
</screenshot>
</screenshots>
diff --git a/lib/gs-appstream.c b/lib/gs-appstream.c
index c7c165b3c..d48c8f14b 100644
--- a/lib/gs-appstream.c
+++ b/lib/gs-appstream.c
@@ -687,7 +687,7 @@ gs_appstream_refine_app_content_rating (GsApp *app,
/* get attributes; no attributes being found (i.e.
* `<content_rating type="*"/>`) is OK: it means that all attributes have
* value `none`, as per the
- * [OARS semantics](https://github.com/hughsie/oars/blob/master/specification/oars-1.1.md) */
+ * [OARS semantics](https://github.com/hughsie/oars/blob/HEAD/specification/oars-1.1.md) */
content_attributes = xb_node_query (content_rating, "content_attribute", 0, &error_local);
if (content_attributes == NULL &&
g_error_matches (error_local, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) {
diff --git a/lib/gs-odrs-provider.c b/lib/gs-odrs-provider.c
index bf2923e1c..a7e30a746 100644
--- a/lib/gs-odrs-provider.c
+++ b/lib/gs-odrs-provider.c
@@ -14,7 +14,7 @@
*
* To test this plugin locally you will probably want to build and run the
* `odrs-web` container, following the instructions in the
- * [`odrs-web` repository](https://gitlab.gnome.org/Infrastructure/odrs-web/-/blob/master/README.md),
+ * [`odrs-web` repository](https://gitlab.gnome.org/Infrastructure/odrs-web/-/blob/HEAD/app_data/README.md),
* and then get gnome-software to use your local review server by running:
* ```
* gsettings set org.gnome.software review-server 'http://127.0.0.1:5000/1.0/reviews/api'
diff --git a/plugins/malcontent/gs-plugin-malcontent.c b/plugins/malcontent/gs-plugin-malcontent.c
index 22b89d17d..b9b545c06 100644
--- a/plugins/malcontent/gs-plugin-malcontent.c
+++ b/plugins/malcontent/gs-plugin-malcontent.c
@@ -93,7 +93,7 @@ app_is_expected_to_have_content_rating (GsApp *app)
* the app. If so, we have to assume the most restrictive ratings. However, if
* @rating is provided but is empty, we assume that every section in it has
* value %AS_CONTENT_RATING_VALUE_NONE. See
- * https://github.com/hughsie/oars/blob/master/specification/oars-1.1.md */
+ * https://github.com/hughsie/oars/blob/HEAD/specification/oars-1.1.md */
static gboolean
app_is_content_rating_appropriate (GsApp *app, MctAppFilter *app_filter)
{
diff --git a/src/gs-app-context-bar.c b/src/gs-app-context-bar.c
index 03438a949..0078a9203 100644
--- a/src/gs-app-context-bar.c
+++ b/src/gs-app-context-bar.c
@@ -87,7 +87,7 @@ update_storage_tile (GsAppContextBar *self)
* This is displayed in a context tile, so the string should be short. */
title = _("Installed Size");
/* FIXME: Calculate data and cache usage so we can set the text
- * as per
https://gitlab.gnome.org/Teams/Design/software-mockups/-/raw/master/adaptive/context-tiles.png
+ * as per
https://gitlab.gnome.org/Teams/Design/software-mockups/-/raw/HEAD/adaptive/context-tiles.png
description = "Includes 230 MB of data and 1.8 GB of cache"; */
description = "";
} else {
@@ -96,7 +96,7 @@ update_storage_tile (GsAppContextBar *self)
* This is displayed in a context tile, so the string should be short. */
title = _("Download Size");
/* FIXME: Calculate data and cache usage so we can set the text
- * as per
https://gitlab.gnome.org/Teams/Design/software-mockups/-/raw/master/adaptive/context-tiles.png
+ * as per
https://gitlab.gnome.org/Teams/Design/software-mockups/-/raw/HEAD/adaptive/context-tiles.png
description = "Needs 150 MB of additional system downloads"; */
description = "";
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]