diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e3fc6ff9ae5..54afda84dcb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -18,7 +18,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: ' 0.125.4' + hugo-version: ' 0.148.2' extended: true - name: Build run: chmod +x build-site.sh && ./build-site.sh diff --git a/.github/workflows/link-check.yml b/.github/workflows/link-check.yml index ca77cca61ed..db87a0b267a 100644 --- a/.github/workflows/link-check.yml +++ b/.github/workflows/link-check.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: ' 0.125.4' + hugo-version: ' 0.148.2' extended: true - name: Setup Node diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f5f09037a3..b99d7cf1bf5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@v3 with: - hugo-version: '0.125.4' + hugo-version: '0.148.2' extended: true - name: Build run: chmod +x build-site.sh && ./build-site.sh diff --git a/.gitpod.yml b/.gitpod.yml index c5bf57fb4d9..db5e0cdab25 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,9 +1,9 @@ tasks: - name: Install Hugo, init submodules and start website init: | - curl -LO https://github.com/gohugoio/hugo/releases/download/v0.125.4/hugo_extended_0.125.4_linux-amd64.deb && \ - sudo dpkg -i hugo_extended_0.125.4_linux-amd64.deb && \ - sudo rm hugo_extended_0.125.4_linux-amd64.deb + curl -LO https://github.com/gohugoio/hugo/releases/download/v0.148.2/hugo_extended_0.148.2_linux-amd64.deb && \ + sudo dpkg -i hugo_extended_0.148.2_linux-amd64.deb && \ + sudo rm hugo_extended_0.148.2_linux-amd64.deb command: | cd website_and_docs hugo server --baseURL $(gp url 1313) --appendPort=false diff --git a/README.md b/README.md index b58633891df..0fee4928daf 100755 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This is the repository used to build and publish the official Selenium [website] We use [Hugo](https://gohugo.io/) and the [Docsy theme](https://www.docsy.dev/) to build and render the site. You will need the **extended** Sass/SCSS version of the Hugo binary to work on this site. We recommend -to use **[Hugo 0.125.4](https://github.com/gohugoio/hugo/releases/tag/v0.125.4)** +to use **[Hugo 0.148.2](https://github.com/gohugoio/hugo/releases/tag/v0.148.2)** Steps needed to have this working locally and work on it: diff --git a/netlify.toml b/netlify.toml index 9134e4bc706..2d2312eb69c 100644 --- a/netlify.toml +++ b/netlify.toml @@ -4,7 +4,7 @@ command = "chmod +x build-site.sh && ./build-site.sh" [context.production.environment] NODE_VERSION = "22.13.0" -HUGO_VERSION = "0.125.4" +HUGO_VERSION = "0.148.2" GO_VERSION = "1.20.1" HUGO_ENV = "production" @@ -13,7 +13,7 @@ command = "chmod +x build-site.sh && ./build-site.sh" [context.deploy-preview.environment] NODE_VERSION = "22.13.0" -HUGO_VERSION = "0.125.4" +HUGO_VERSION = "0.148.2" GO_VERSION = "1.20.1" [context.branch-deploy] @@ -21,5 +21,5 @@ command = "chmod +x build-site.sh && ./build-site.sh" [context.branch-deploy.environment] NODE_VERSION = "22.13.0" -HUGO_VERSION = "0.125.4" +HUGO_VERSION = "0.148.2" GO_VERSION = "1.20.1" diff --git a/website_and_docs/content/documentation/about/contributing.en.md b/website_and_docs/content/documentation/about/contributing.en.md index 993437df8f4..cb512ebb533 100644 --- a/website_and_docs/content/documentation/about/contributing.en.md +++ b/website_and_docs/content/documentation/about/contributing.en.md @@ -117,7 +117,7 @@ and check out your copy locally. We use [Hugo](https://gohugo.io/) and the [Docsy theme](https://www.docsy.dev/) to build and render the site. You will need the “extended” Sass/SCSS version of the Hugo binary to work on this site. We recommend -to use Hugo 0.125.4 . +to use Hugo 0.148.2 . Please follow the [Install Hugo](https://www.docsy.dev/docs/getting-started/#install-hugo) instructions from Docsy. diff --git a/website_and_docs/content/documentation/about/contributing.ja.md b/website_and_docs/content/documentation/about/contributing.ja.md index 138fead97eb..daa8dea23eb 100644 --- a/website_and_docs/content/documentation/about/contributing.ja.md +++ b/website_and_docs/content/documentation/about/contributing.ja.md @@ -94,7 +94,7 @@ Seleniumプロジェクトは新しいコントリビュータを歓迎します #### 依存関係: Hugo -[Hugo](https://gohugo.io/)と[Docsyテーマ](https://www.docsy.dev/)を使用してサイトの構築とレンダリングをしています。このサイトの作業をするには、Hugoバイナリの“拡張”Sass/SCSSバージョンが必要です。Hugo 0.125.4の使用を推奨します。 +[Hugo](https://gohugo.io/)と[Docsyテーマ](https://www.docsy.dev/)を使用してサイトの構築とレンダリングをしています。このサイトの作業をするには、Hugoバイナリの“拡張”Sass/SCSSバージョンが必要です。Hugo 0.148.2の使用を推奨します。 [Docsyのインストール手順](https://www.docsy.dev/docs/getting-started/#install-hugo)に従ってください。 diff --git a/website_and_docs/content/documentation/about/contributing.pt-br.md b/website_and_docs/content/documentation/about/contributing.pt-br.md index 90a86c7fa7c..b652b84b6d4 100644 --- a/website_and_docs/content/documentation/about/contributing.pt-br.md +++ b/website_and_docs/content/documentation/about/contributing.pt-br.md @@ -117,7 +117,7 @@ e faça checkout na sua cópia localmente. Usamos [Hugo](https://gohugo.io/) e [Docsy theme](https://www.docsy.dev/) para criar e gerar o website. Você vai necessitar de usar a versão "extended" -Sass/SCSS do binário Hugo. Recomendamos a versão 0.125.4 . +Sass/SCSS do binário Hugo. Recomendamos a versão 0.148.2 . Por favor siga as instruções do Docsy [Install Hugo](https://www.docsy.dev/docs/getting-started/#install-hugo) diff --git a/website_and_docs/content/documentation/about/contributing.zh-cn.md b/website_and_docs/content/documentation/about/contributing.zh-cn.md index 84a81142c46..dc8edb22a8f 100644 --- a/website_and_docs/content/documentation/about/contributing.zh-cn.md +++ b/website_and_docs/content/documentation/about/contributing.zh-cn.md @@ -113,7 +113,7 @@ Selenium项目欢迎新的贡献者. 我们使用 [Hugo](https://gohugo.io/) 和 [Docsy theme](https://www.docsy.dev/) 用于构建和渲染本网站. 你需要Hugo“extended”扩展的Sass/SCSS版本用于这个网站. -我们推荐使用Hugo 0.125.4 . +我们推荐使用Hugo 0.148.2 . 请参考来自Docsy的说明 [安装Hugo](https://www.docsy.dev/docs/getting-started/#install-hugo) . diff --git a/website_and_docs/hugo.toml b/website_and_docs/hugo.toml index 940cf8d5c01..6ba10bb1dca 100644 --- a/website_and_docs/hugo.toml +++ b/website_and_docs/hugo.toml @@ -27,7 +27,7 @@ pygmentsStyle = "tango" # Configure how URLs look like per section. [permalinks] -blog = "/:section/:year/:filename/" +blog = "/:section/:year/:contentbasename/" # blog = "/:section/:year/:month/:day/:slug/" ## Configuration for BlackFriday markdown parser: https://github.com/russross/blackfriday diff --git a/website_and_docs/layouts/partials/previous-releases.html b/website_and_docs/layouts/partials/previous-releases.html index 77d8e1ffb85..4d408b1d70b 100644 --- a/website_and_docs/layouts/partials/previous-releases.html +++ b/website_and_docs/layouts/partials/previous-releases.html @@ -26,7 +26,8 @@ {{ $toReplace := printf "://%s@" $githubToken }} {{ $tokenInUrl := cond (eq $githubToken "") "://" $toReplace }} {{ $urlWithToken := replace $url "://" $tokenInUrl }} - {{ $releases := getJSON $urlWithToken }} + {{ $releasesJson := resources.GetRemote $urlWithToken }} + {{ $releases := $releasesJson | transform.Unmarshal }} {{ range sort $releases "created_at" "desc" }} {{ $.Scratch.Set "counter" (add ($.Scratch.Get "counter") 1) }} diff --git a/website_and_docs/layouts/shortcodes/gh-codeblock.html b/website_and_docs/layouts/shortcodes/gh-codeblock.html index 1db52648f83..bd5d715e142 100644 --- a/website_and_docs/layouts/shortcodes/gh-codeblock.html +++ b/website_and_docs/layouts/shortcodes/gh-codeblock.html @@ -35,7 +35,9 @@ {{ $tokenInUrl := cond (eq $githubToken "") "://" $toReplace }} {{ $apiUrlWithToken := replace $apiUrl "://" $tokenInUrl }} -{{ $apiResults := getJSON $apiUrlWithToken }} +{{ $apiResultsJson := resources.GetRemote $apiUrlWithToken }} +{{ $apiResults := $apiResultsJson | transform.Unmarshal }} + {{ $content := base64Decode $apiResults.content }} {{ $codeSnippet := $content }} diff --git a/website_and_docs/layouts/shortcodes/gh-contributors.html b/website_and_docs/layouts/shortcodes/gh-contributors.html index 82f8abb94f5..fc97a89932a 100644 --- a/website_and_docs/layouts/shortcodes/gh-contributors.html +++ b/website_and_docs/layouts/shortcodes/gh-contributors.html @@ -25,7 +25,10 @@ {{ $tokenInUrl :=cond (eq $githubToken "") "://" $toReplace }} {{ $url := replace $url "://" $tokenInUrl }} - {{ range getJSON $url }} + {{ $contributorJson := resources.GetRemote $url }} + {{ $contributors := $contributorJson | transform.Unmarshal }} + + {{ range $contributors }}
- {{$jsonUrl.name}} + {{$user.name}}

- {{$jsonUrl.name}} + {{$user.name}}