diff --git a/.gitlab-ci.main.kts b/.gitlab-ci.main.kts index e03a08d..17a91f2 100755 --- a/.gitlab-ci.main.kts +++ b/.gitlab-ci.main.kts @@ -1,7 +1,7 @@ #!/usr/bin/env kotlin // https://gitlab-ci-kts.opensavvy.dev/news/index.html -@file:DependsOn("dev.opensavvy.gitlab:gitlab-ci-kotlin-jvm:0.7.0") +@file:DependsOn("dev.opensavvy.gitlab:gitlab-ci-kotlin-jvm:0.7.1") import opensavvy.gitlab.ci.* import opensavvy.gitlab.ci.Environment.EnvironmentTier.Development -- 2.51.2 From 3b0f9f0a49f91f216ea65a48561d1db44bdbe6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sun, 12 Oct 2025 15:14:49 +0200 Subject: [PATCH 2/8] upgrade: CI Containers 0.8.2 --- .gitlab-ci.main.kts | 6 ++---- .gitlab-ci.yml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.main.kts b/.gitlab-ci.main.kts index 17a91f2..3827a19 100755 --- a/.gitlab-ci.main.kts +++ b/.gitlab-ci.main.kts @@ -7,10 +7,8 @@ import opensavvy.gitlab.ci.* import opensavvy.gitlab.ci.Environment.EnvironmentTier.Development import opensavvy.gitlab.ci.script.shell -/** - * The version of images downloaded from https://gitlab.com/opensavvy/automation/containers - */ -val ciContainers = "0.8.1" +// https://gitlab.com/opensavvy/automation/containers/-/releases +val ciContainers = "0.8.2" /** * The URL of the website built by /docs/website. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3e7aeec..8d90ba0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ include: variables: # https://gitlab.com/opensavvy/automation/containers - ci_containers: 0.8.1 + ci_containers: 0.8.2 workflow: rules: -- 2.51.2 From f56980a11122b9f88ff992bceb51ef3faae744ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 17 Nov 2025 19:08:06 +0100 Subject: [PATCH 3/8] feat(website): Enable Plausible --- docs/website/mkdocs.yml | 4 ++++ .../integrations/analytics/custom.html | 21 +++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 docs/website/overrides/partials/integrations/analytics/custom.html diff --git a/docs/website/mkdocs.yml b/docs/website/mkdocs.yml index 4838ed6..ff11a12 100644 --- a/docs/website/mkdocs.yml +++ b/docs/website/mkdocs.yml @@ -76,6 +76,10 @@ plugins: as_update: date.updated use_git: false +extra: + analytics: + provider: custom + markdown_extensions: - admonition - attr_list diff --git a/docs/website/overrides/partials/integrations/analytics/custom.html b/docs/website/overrides/partials/integrations/analytics/custom.html new file mode 100644 index 0000000..303be29 --- /dev/null +++ b/docs/website/overrides/partials/integrations/analytics/custom.html @@ -0,0 +1,21 @@ + + -- 2.51.2 From 88d9fb7dd4b53b0a3241c0322869325738e6b106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 17 Nov 2025 19:27:34 +0100 Subject: [PATCH 4/8] feat(website): Capture more metadata in Plausible --- .../overrides/partials/integrations/analytics/custom.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/website/overrides/partials/integrations/analytics/custom.html b/docs/website/overrides/partials/integrations/analytics/custom.html index 303be29..bdbaa3c 100644 --- a/docs/website/overrides/partials/integrations/analytics/custom.html +++ b/docs/website/overrides/partials/integrations/analytics/custom.html @@ -10,6 +10,13 @@ // Configure endpoint before the library loads • https://plausible.io/docs/script-extensions#plausibleinit-configuration plausible.init({ endpoint: 'https://p.opensavvy.dev/event', + customProperties: function(eventname) { + return { + host: window.location.host, + project: '{{ config.site_name }}', + area: 'site', + } + }, }); // Append the external script dynamically (function () { -- 2.51.2 From d3887133501098b975fcaac04c70d27c27156b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 17 Nov 2025 20:40:39 +0100 Subject: [PATCH 5/8] feat(website): Add the site url in the page name --- .../overrides/partials/integrations/analytics/custom.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/website/overrides/partials/integrations/analytics/custom.html b/docs/website/overrides/partials/integrations/analytics/custom.html index bdbaa3c..981672d 100644 --- a/docs/website/overrides/partials/integrations/analytics/custom.html +++ b/docs/website/overrides/partials/integrations/analytics/custom.html @@ -17,6 +17,10 @@ area: 'site', } }, + transformRequest: function(request) { + request.u = request.u.replace(/.*\/jobs\/[0-9]+\/artifacts\/[^\/]*/g, ''); // Remove review app URL prefix + return request; + } }); // Append the external script dynamically (function () { -- 2.51.2 From 822cc25af8a478a9c7221c44b30d428782aa7793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 17 Nov 2025 22:32:24 +0100 Subject: [PATCH 6/8] docs(website): Fix the 'News by category' page which was empty --- docs/website/docs/news/tags.md | 2 ++ docs/website/mkdocs.yml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/website/docs/news/tags.md b/docs/website/docs/news/tags.md index 920c8a4..cabb231 100644 --- a/docs/website/docs/news/tags.md +++ b/docs/website/docs/news/tags.md @@ -1 +1,3 @@ # News by category + + diff --git a/docs/website/mkdocs.yml b/docs/website/mkdocs.yml index 4838ed6..f185f5e 100644 --- a/docs/website/mkdocs.yml +++ b/docs/website/mkdocs.yml @@ -67,8 +67,7 @@ plugins: post_excerpt: optional authors: false blog_dir: news - - tags: - tag_file: news/tags.md + - tags - rss: match_path: 'news/posts/.*' date_from_meta: -- 2.51.2 From a203a49114ac00478b27b2c7ab972ca51a255c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 17 Nov 2025 22:33:04 +0100 Subject: [PATCH 7/8] docs(website): Rename the release tag from 'New version' to 'Releases' --- docs/website/generate-news.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/generate-news.sh b/docs/website/generate-news.sh index b61ae4b..1cb018b 100755 --- a/docs/website/generate-news.sh +++ b/docs/website/generate-news.sh @@ -7,7 +7,7 @@ for tag in $(git tag --list -n1 | cut -d' ' -f1); do tag_file="docs/news/posts/releases/release-$tag.md" git for-each-ref \ - --format="---%ndate:%n created: %(taggerdate:short)%nslug: v$tag%ntags: [New version]%n---%n%n# $tag • %(subject)%n%n%(contents:body)" \ + --format="---%ndate:%n created: %(taggerdate:short)%nslug: v$tag%ntags: %n - Releases%n---%n%n# $tag • %(subject)%n%n%(contents:body)" \ "refs/tags/$tag" \ | sed 's/%n/\n/g' \ | sed -r "s~\#([0-9]+)~[#\1]($CI_PROJECT_URL/-/issues/\1)~g" \ -- 2.51.2 From 693de89db9a2c6e6e013420961a2ef4454f9518b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 17 Nov 2025 22:33:27 +0100 Subject: [PATCH 8/8] docs(website): Fix commits being marked with a # like issues --- docs/website/generate-news.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/generate-news.sh b/docs/website/generate-news.sh index 1cb018b..d748dad 100755 --- a/docs/website/generate-news.sh +++ b/docs/website/generate-news.sh @@ -11,7 +11,7 @@ for tag in $(git tag --list -n1 | cut -d' ' -f1); do "refs/tags/$tag" \ | sed 's/%n/\n/g' \ | sed -r "s~\#([0-9]+)~[#\1]($CI_PROJECT_URL/-/issues/\1)~g" \ - | sed -r "s~([0-9a-f]{4,40})([,\)])~[#\1]($CI_PROJECT_URL/-/commit/\1)\2~g" \ + | sed -r "s~([0-9a-f]{4,40})([,\)])~[\1]($CI_PROJECT_URL/-/commit/\1)\2~g" \ | sed -r "s~!([0-9]+)~[!\1]($CI_PROJECT_URL/-/merge_requests/\1)~g" \ >"$tag_file"