From f6d7b03205cdc9682e1c0e41d6d7f9dcd247d630 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 14 Jun 2024 22:58:02 -0400 Subject: [PATCH 01/15] setup: activate po plugin --- .gitlab-ci.yml | 2 +- ikiwiki.setup | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a324ee3..c9ad032 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apk add git ikiwiki + - sudo apk add git ikiwiki po4a perl-yaml-tiny - git submodule init - git submodule update diff --git a/ikiwiki.setup b/ikiwiki.setup index 95ae6e2..fbabbc0 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -44,6 +44,7 @@ add_plugins: - highlight - typography - sidebar2 +- po # plugins to disable disable_plugins: [] # additional directory to search for template files @@ -401,3 +402,14 @@ global_sidebars: - footer - footer - "*" + +# po plugin +# used to set the "master" language +po_master_language: en|English +# po_slave_languages is used to set the list of supported "slave" languages +po_slave_languages: +- fr|Français +# configures what pages are translatable +po_translatable_pages: '*' +# used to decide how internal links should be generated, depending on web server features and site-specific preferences. +po_link_to: current -- 2.47.2 From de663a4a5ea78eb38617fd81eac58b4ee8c1b5bb Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 14 Jun 2024 22:58:26 -0400 Subject: [PATCH 02/15] content/index: add french translation --- content/index.fr.po | 59 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 content/index.fr.po diff --git a/content/index.fr.po b/content/index.fr.po new file mode 100644 index 0000000..1875330 --- /dev/null +++ b/content/index.fr.po @@ -0,0 +1,59 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-06-14 19:45-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 3.13.0\n" + +#: index.mdwn%2Bp +msgid "[[!meta title=\"About Us\"]]" +msgstr "" + +#: index.mdwn%2Bp +msgid "" +"[ilot]{1} is a cooperative corner of the internet. We operate different free " +"and open-source platforms, like Nextcloud and Mastodon, all integrated " +"together by a shared authentication system. We aim to eventually incorporate " +"as a cooperative to create a digital infrastructure that is by and for its " +"users as an alternative to the siloed and privatized internet of today. " +"Members fund our operations and decide how to set our community policies, " +"steward our data, and manage our shared technologies. Members also provide " +"the labor to run ilot at all levels." +msgstr "" + +#: index.mdwn%2Bp +msgid "" +"The project is currently in beta, as there is still a lot of work left to " +"do. While the technical infrastructure is setup and stable, the governance " +"and community guidelines are still a work in progress. If you are interested " +"in joining ilot, we are working on getting a registration process going." +msgstr "" + +#: index.mdwn%2Bp +msgid "" +"ilot was started in 2021 when AESA-CIRI, the sociology, anthropology and " +"immigration studies sudent association of UQAM, wanted to create its own " +"digital infrastructure. Since then, we have worked toward the goal of making " +"the project useful to other organisations and individuals." +msgstr "" + +#: index.mdwn%2Bheading +msgid "Learn more" +msgstr "" + +#: index.mdwn%2Bp +msgid "To learn more please visit some of the pages:" +msgstr "" + +#: index.mdwn%2Bp +msgid "" +"[[Platforms]] - The online spaces we use and manage\n" +"[Support]{1} - Guides for how to do things on ilot and to get help" +msgstr "" -- 2.47.2 From bb27cd448914b1fc3ada02598a4f52cd2a473caa Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 14 Jun 2024 23:54:17 -0400 Subject: [PATCH 03/15] Add initial po translations to fr --- content/footer.fr.po | 26 ++++++++++++++++ content/footer.mdwn | 11 ++----- content/index.fr.po | 66 ++++++++++++++++++++++++++++------------- content/platforms.fr.po | 44 +++++++++++++++++++++++++++ content/platforms.mdwn | 6 ++-- content/sidebar.fr.po | 24 +++++++++++++++ ikiwiki.setup | 2 +- 7 files changed, 146 insertions(+), 33 deletions(-) create mode 100644 content/footer.fr.po create mode 100644 content/platforms.fr.po create mode 100644 content/sidebar.fr.po diff --git a/content/footer.fr.po b/content/footer.fr.po new file mode 100644 index 0000000..2f5ee60 --- /dev/null +++ b/content/footer.fr.po @@ -0,0 +1,26 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2024-06-14 23:44-0400\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 3.13.0\n" + +#: type, Content of:

+msgid "" +"Powered by ikiwiki." +"Theme by " +"Anarcat." +"Valid (X)HTML 5." +msgstr "" +"Propulsé par ikiwiki." +"Theme by " +"Anarcat." +"Valid (X)HTML 5." + diff --git a/content/footer.mdwn b/content/footer.mdwn index 64d6b2f..5ac18a8 100644 --- a/content/footer.mdwn +++ b/content/footer.mdwn @@ -1,15 +1,10 @@

-Copyleft © 2024-2024 -ilot CC-BY-SA. - +Copyleft © 2024-2024 ilot CC-BY-SA. -Powered -by ikiwiki. -Theme -by Anarcat. +Powered by ikiwiki. +Theme by Anarcat. Valid (X)HTML 5.

diff --git a/content/index.fr.po b/content/index.fr.po index 1875330..3156ead 100644 --- a/content/index.fr.po +++ b/content/index.fr.po @@ -1,40 +1,59 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-14 19:45-0400\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"Project-Id-Version: Ilot\n" +"Report-Msgid-Bugs-To: support@ilot.io\n" +"POT-Creation-Date: 2024-06-14 23:00-0400\n" +"PO-Revision-Date: 2024-06-14 23:14-0400\n" +"Last-Translator: Antoine Martin \n" +"Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 3.13.0\n" +"X-Generator: Poedit 3.4.3\n" #: index.mdwn%2Bp msgid "[[!meta title=\"About Us\"]]" -msgstr "" +msgstr "[[!meta title=\"À propos de nous\"]]" + +#: type: Content of:

+msgid "WELCOME" +msgstr "BIENVENUE" #: index.mdwn%2Bp msgid "" -"[ilot]{1} is a cooperative corner of the internet. We operate different free " +"[ilot](https://ilot.io) is a cooperative corner of the internet. We operate different free " "and open-source platforms, like Nextcloud and Mastodon, all integrated " "together by a shared authentication system. We aim to eventually incorporate " "as a cooperative to create a digital infrastructure that is by and for its " "users as an alternative to the siloed and privatized internet of today. " "Members fund our operations and decide how to set our community policies, " -"steward our data, and manage our shared technologies. Members also provide " -"the labor to run ilot at all levels." +"steward our data, and manage our shared technologies. Members also provide the " +"labor to run ilot at all levels." msgstr "" +"[ilot](https://ilot.io) est un coin coopératif de l'internet. Nous administrons différentes " +"plateformes libres, comme Nextcloud et Mastodon, toutes intégrées ensemble par " +"un système d'authentification unifié. Nous visons à incorporer en tant que " +"coopérative afin de créer une infrastructure numérique par et pour ses " +"utilisateur-ice-s, se plaçon alors comme alternative à l'internet cloisonné et " +"privatisé d'aujourd'hui. Les membres financent nos opérations et décident de " +"la manière de définir nos politiques communautaires, de gérer nos données et " +"nos technologies partagées. Les membres fournissent également la main d'œuvre " +"pour faire fonctionner ilot à tous les niveaux." #: index.mdwn%2Bp msgid "" -"The project is currently in beta, as there is still a lot of work left to " -"do. While the technical infrastructure is setup and stable, the governance " -"and community guidelines are still a work in progress. If you are interested " -"in joining ilot, we are working on getting a registration process going." +"The project is currently in beta, as there is still a lot of work left to do. " +"While the technical infrastructure is setup and stable, the governance and " +"community guidelines are still a work in progress. If you are interested in " +"joining ilot, we are working on getting a registration process going." msgstr "" +"Le projet est actuellement en version bêta, car il reste encore beaucoup de " +"travail à faire. Alors que l'infrastructure technique est mise en place et " +"stable, la gouvernance et les lignes directrices de la communauté sont encore " +"en cours d'élaboration. Si vous souhaitez rejoindre ilot, nous travaillons à " +"la mise en place d'un processus d'inscription." #: index.mdwn%2Bp msgid "" @@ -43,17 +62,22 @@ msgid "" "digital infrastructure. Since then, we have worked toward the goal of making " "the project useful to other organisations and individuals." msgstr "" +"ilot a vu le jour en 2021 lorsque l'AESA-CIRI, l'association des étudiants en " +"sociologie, anthropologie et études de l'immigration de l'UQAM, a voulu créer " +"sa propre infrastructure numérique. Depuis, nous travaillons dans le but de " +"rendre le projet utile à d'autres organisations et individus." #: index.mdwn%2Bheading msgid "Learn more" -msgstr "" +msgstr "Savoir plus" #: index.mdwn%2Bp msgid "To learn more please visit some of the pages:" -msgstr "" +msgstr "Pour en savoir plus, veuillez consulter certaines pages:" + +msgid "[[Platforms]] - The online spaces we use and manage \n" +msgstr "[[Plateformes|Platforms]] - Les espaces en ligne que nous utilisons et gérons \n" #: index.mdwn%2Bp -msgid "" -"[[Platforms]] - The online spaces we use and manage\n" -"[Support]{1} - Guides for how to do things on ilot and to get help" -msgstr "" +msgid "[Support](https://support.ilot.io) - Guides for how to do things on ilot and to get help \n" +msgstr "[Support](https://support.ilot.io) - Guides sur la façon de faire les choses sur ilot et obtenir de l'aide \n" diff --git a/content/platforms.fr.po b/content/platforms.fr.po new file mode 100644 index 0000000..3cb3514 --- /dev/null +++ b/content/platforms.fr.po @@ -0,0 +1,44 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Ilot\n" +"Report-Msgid-Bugs-To: support@ilot.io\n" +"POT-Creation-Date: 2024-06-14 23:00-0400\n" +"PO-Revision-Date: 2024-06-14 23:00-0400\n" +"Last-Translator: Antoine Martin \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 3.13.0\n" + +#: platforms.mdwn%2Bheading +msgid "Platforms" +msgstr "Plateformes" + +#: platforms.mdwn%2Blist-item.p +msgid "[The Cloud]{1}" +msgstr "[Le Cloud]{1}" + +#: platforms.mdwn%2Blist-item.p +msgid "[The Agora]{1}" +msgstr "[L'Agora]{1}" + +#: platforms.mdwn%2Blist-item.p +msgid "[The Lab]{1}" +msgstr "[Le Lab]{1}" + +#: platforms.mdwn%2Blist-item.p +msgid "[Authentik]{1}" +msgstr "[Authentik]{1}" + +#: platforms.mdwn%2Blist-item.p +msgid "[Support]{1}" +msgstr "[SUpport]{1}" + +#: platforms.mdwn%2Blist-item.p +msgid "[Status]{1}" +msgstr "[Status]{1}" + +#: platforms.mdwn%2Blist-item.p +msgid "[Notif]{1}" +msgstr "[Notif]{1}" diff --git a/content/platforms.mdwn b/content/platforms.mdwn index 81b8bbb..8f5f26d 100644 --- a/content/platforms.mdwn +++ b/content/platforms.mdwn @@ -1,8 +1,8 @@ # Platforms -* [Le Cloud](https://cloud.ilot.io) -* [L'Agora](https://agora.ilot.io) -* [Le Lab](https://lab.ilot.io) +* [Cloud](https://cloud.ilot.io) +* [Agora](https://agora.ilot.io) +* [Lab](https://lab.ilot.io) * [Authentik](https://auth.ilot.io) * [Support](https://support.ilot.io) * [Status](https://status.ilot.io) diff --git a/content/sidebar.fr.po b/content/sidebar.fr.po new file mode 100644 index 0000000..432ba1a --- /dev/null +++ b/content/sidebar.fr.po @@ -0,0 +1,24 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: Ilot\n" +"Report-Msgid-Bugs-To: support@ilot.io\n" +"POT-Creation-Date: 2024-06-14 23:00-0400\n" +"PO-Revision-Date: 2024-06-14 23:00-0400\n" +"Last-Translator: Antoine Martin \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 3.13.0\n" + +#: sidebar.mdwn%2Bul.li:3-1 +msgid "[[About Us|index]]" +msgstr "[[À propos de nous|index]]" + +#: sidebar.mdwn%2Bul.li:4-1 +msgid "[[Platforms]]" +msgstr "[[Plateformes]]" + +#: sidebar.mdwn%2Bul.li:5-1 +msgid "Support" +msgstr "Support" diff --git a/ikiwiki.setup b/ikiwiki.setup index fbabbc0..f8ebf1a 100644 --- a/ikiwiki.setup +++ b/ikiwiki.setup @@ -410,6 +410,6 @@ po_master_language: en|English po_slave_languages: - fr|Français # configures what pages are translatable -po_translatable_pages: '*' +po_translatable_pages: 'index or footer or platforms or sidebar' # used to decide how internal links should be generated, depending on web server features and site-specific preferences. po_link_to: current -- 2.47.2 From c87f6e9a9a68a8daac3680f572a1e7754c52e6b3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 14 Jun 2024 23:57:40 -0400 Subject: [PATCH 04/15] Create test deployment --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9ad032..3f98514 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,16 @@ test: - ikiwiki --setup ikiwiki.setup rules: - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH + artifacts: + paths: + - public tags: - knit + environment: + name: Develop + url: "https://$CI_PROJECT_NAMESPACE.lab.ilot.io/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public/index.html" + variables: + PUBLIC_URL: "/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public" pages: stage: deploy -- 2.47.2 From 489fe20743abc68f5f89a00cd8361772172b4808 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 14 Jun 2024 23:59:31 -0400 Subject: [PATCH 05/15] Create test deployment --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f98514..a4f0542 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ test: - knit environment: name: Develop - url: "https://$CI_PROJECT_NAMESPACE.lab.ilot.io/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public/index.html" + url: "https://$CI_PROJECT_NAMESPACE.lab.ilot.io/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public/index.html" variables: PUBLIC_URL: "/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public" -- 2.47.2 From e66c3a384c89a102a3d430a9dd52c977388cb9c2 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:02:23 -0400 Subject: [PATCH 06/15] Create test deployment --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4f0542..ed85126 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ test: - knit environment: name: Develop - url: "https://$CI_PROJECT_NAMESPACE.lab.ilot.io/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public/index.html" + url: "https://lab.ilot.io/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public/index.html" variables: PUBLIC_URL: "/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public" -- 2.47.2 From 74979d132cd492271e0cc56a0fa7ebe692ad849e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:08:33 -0400 Subject: [PATCH 07/15] Try to push to pages --- .gitlab-ci.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed85126..0b1bfac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,20 +14,16 @@ test: - public tags: - knit - environment: - name: Develop - url: "https://lab.ilot.io/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public/index.html" - variables: - PUBLIC_URL: "/-/$CI_PROJECT_NAME/-/jobs/$CI_JOB_ID/artifacts/public" pages: stage: deploy script: - ikiwiki --setup ikiwiki.setup + - echo "Pages accessible through ${CI_PAGES_URL}/${CI_COMMIT_BRANCH}" + pages: + path_prefix: "$CI_COMMIT_BRANCH" artifacts: paths: - public - rules: - - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH tags: - knit -- 2.47.2 From f4226eaca60d27f658d31a73cb368519e24ed585 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:09:45 -0400 Subject: [PATCH 08/15] Try to push to pages --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b1bfac..1ba65ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,7 @@ +stages: + - test + - deploy + before_script: - sudo apk add git ikiwiki po4a perl-yaml-tiny - git submodule init -- 2.47.2 From 67003971b4a5f45f7f4829a466f74f9cdf139b5e Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:11:55 -0400 Subject: [PATCH 09/15] Try to push to pages --- .gitlab-ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ba65ee..45d834f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,3 @@ -stages: - - test - - deploy - before_script: - sudo apk add git ikiwiki po4a perl-yaml-tiny - git submodule init @@ -11,8 +7,11 @@ test: stage: test script: - ikiwiki --setup ikiwiki.setup + - echo "Pages accessible through ${CI_PAGES_URL}/${CI_COMMIT_BRANCH}" rules: - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH + pages: + path_prefix: "$CI_COMMIT_BRANCH" artifacts: paths: - public @@ -23,11 +22,10 @@ pages: stage: deploy script: - ikiwiki --setup ikiwiki.setup - - echo "Pages accessible through ${CI_PAGES_URL}/${CI_COMMIT_BRANCH}" - pages: - path_prefix: "$CI_COMMIT_BRANCH" artifacts: paths: - public + rules: + - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH tags: - knit -- 2.47.2 From d99171410d8d34a2f05a898ee24c7efe6534e5e4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:12:22 -0400 Subject: [PATCH 10/15] Try to push to pages --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45d834f..334f627 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ before_script: - git submodule init - git submodule update -test: +pages: stage: test script: - ikiwiki --setup ikiwiki.setup -- 2.47.2 From 9a79303eef0e95d936a7a1e0b96bf95e66966cac Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:17:22 -0400 Subject: [PATCH 11/15] Try to push to pages --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 334f627..5e8ef25 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ before_script: - git submodule init - git submodule update -pages: +pages:test: stage: test script: - ikiwiki --setup ikiwiki.setup @@ -18,7 +18,7 @@ pages: tags: - knit -pages: +pages:deploy: stage: deploy script: - ikiwiki --setup ikiwiki.setup -- 2.47.2 From 212314cee7fdfc61dcab7dc8c3b55c2a75b8c8a7 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:18:23 -0400 Subject: [PATCH 12/15] Try to push to pages --- .gitlab-ci.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e8ef25..6f4eee3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,29 +3,14 @@ before_script: - git submodule init - git submodule update -pages:test: - stage: test - script: - - ikiwiki --setup ikiwiki.setup - - echo "Pages accessible through ${CI_PAGES_URL}/${CI_COMMIT_BRANCH}" - rules: - - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH - pages: - path_prefix: "$CI_COMMIT_BRANCH" - artifacts: - paths: - - public - tags: - - knit - -pages:deploy: +pages: stage: deploy script: - ikiwiki --setup ikiwiki.setup artifacts: paths: - public - rules: - - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH + pages: + path_prefix: "$CI_COMMIT_BRANCH" tags: - knit -- 2.47.2 From 34dcc7eee88c58391357be710d74e9386ac74ed5 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:20:46 -0400 Subject: [PATCH 13/15] Try to push to pages --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f4eee3..15d66f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ pages: stage: deploy script: - ikiwiki --setup ikiwiki.setup + - echo "Pages accessible through ${CI_PAGES_URL}/${CI_COMMIT_BRANCH}" artifacts: paths: - public -- 2.47.2 From 146b1589f14c1daf672da306e79466436fa2c035 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:28:05 -0400 Subject: [PATCH 14/15] bump --- test | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..e69de29 -- 2.47.2 From 613af523ab8247b78ad9e12df600850b190bf4e8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sat, 15 Jun 2024 00:35:44 -0400 Subject: [PATCH 15/15] Attempt better way --- .gitlab-ci.yml | 21 +++++++++++++++++---- test | 0 2 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 test diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15d66f0..309888e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,12 +6,25 @@ before_script: pages: stage: deploy script: - - ikiwiki --setup ikiwiki.setup - - echo "Pages accessible through ${CI_PAGES_URL}/${CI_COMMIT_BRANCH}" + - ikiwiki --setup ikiwiki.setup + - echo "Pages accessible through ${CI_PAGES_URL}/${PAGES_PREFIX}" + variables: + PAGES_PREFIX: "" # no prefix by default (master) + pages: + path_prefix: "$PAGES_PREFIX" + environment: + name: "Pages ${PAGES_PREFIX}" + url: "${CI_PAGES_URL}/${PAGES_PREFIX}" artifacts: paths: - public - pages: - path_prefix: "$CI_COMMIT_BRANCH" + rules: + - if: $CI_COMMIT_BRANCH == "staging" # ensure to run on master (with default PAGES_PREFIX) + variables: + PAGES_PREFIX: '_stg' # prefix with _stg for the staging branch + - if: $CI_PIPELINE_SOURCE == "merge_request_event" # conditionally change the prefix on Merge Requests + when: manual # run pages manually on Merge Requests + variables: + PAGES_PREFIX: 'mr$CI_MERGE_REQUEST_IID' # prefix with the mr, like `mr123` tags: - knit diff --git a/test b/test deleted file mode 100644 index e69de29..0000000 -- 2.47.2