Migration to hugo module (SeleniumHQ#1310)

deining · diemol · web-flow · commit cfe12aaa5d6f · 2023-02-20T22:11:44.000+01:00
* Drop submodule 'docsy', change project to hugo module

* Fix project .scss files

* Adapt netlify configuration

* Rename config.yaml to hugo.yaml

* Using Hugo 110

* Setting version in test workflow

---------

Co-authored-by: Diego Molina &lt;diemol@gmail.com&gt;
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.101.0'
+          hugo-version: '0.110.0'
           extended: true
       - name: Build
         run: chmod +x build-site.sh && ./build-site.sh
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@v2
         with:
-          hugo-version: '0.101.0'
+          hugo-version: '0.110.0'
           extended: true
       - name: Build
         run: chmod +x build-site.sh && ./build-site.sh
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "website_and_docs/themes/docsy"]
-	path = website_and_docs/themes/docsy
-	url = https://github.com/google/docsy.git
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,8 +1,8 @@
 tasks:
   - name: Install Hugo, init submodules and start website
     init: |
-      curl -LO https://github.com/gohugoio/hugo/releases/download/v0.101.0/hugo_extended_0.101.0_Linux-64bit.deb && \
-      sudo dpkg -i hugo_extended_0.101.0_Linux-64bit.deb && \
+      curl -LO https://github.com/gohugoio/hugo/releases/download/v0.101.0/hugo_extended_0.110.0_Linux-64bit.deb && \
+      sudo dpkg -i hugo_extended_0.110.0_Linux-64bit.deb && \
       sudo rm hugo_extended_0.101.0_Linux-64bit.deb
       git submodule update --init --recursive
     command: |
diff --git a/netlify.toml b/netlify.toml
@@ -1,19 +1,26 @@
 [build]
-publish = "website_and_docs/public"
-command = "chmod +x build-site.sh && ./build-site.sh"
+base = "website_and_docs/"
+publish = "public"
+command = "hugo"
 
 [context.production.environment]
-HUGO_VERSION = "0.101.0"
+NODE_VERSION = "18.14.1"
+HUGO_VERSION = "0.110.0"
+GO_VERSION = "1.20.1"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
-command = "chmod +x build-site.sh && ./build-site.sh"
+command = "hugo"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.101.0"
+NODE_VERSION = "18.14.1"
+HUGO_VERSION = "0.110.0"
+GO_VERSION = "1.20.1"
 
 [context.branch-deploy]
-command = "chmod +x build-site.sh && ./build-site.sh"
+command = "hugo --minify"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.101.0"
+NODE_VERSION = "18.14.1"
+HUGO_VERSION = "0.110.0"
+GO_VERSION = "1.20.1"
diff --git a/website_and_docs/assets/scss/_colors_project.scss b/website_and_docs/assets/scss/_colors_project.scss
diff --git a/website_and_docs/assets/scss/_styles_project.scss b/website_and_docs/assets/scss/_styles_project.scss
@@ -0,0 +1,12 @@
+/*
+  Import of additional project style files.
+*/
+
+@import "backgrounds";
+@import "badges";
+@import "colors_project";
+@import "images";
+@import "links";
+@import "logo";
+@import "screen";
+@import "tabs";
diff --git a/website_and_docs/assets/scss/main.scss b/website_and_docs/assets/scss/main.scss
diff --git a/website_and_docs/go.mod b/website_and_docs/go.mod
@@ -0,0 +1,5 @@
+module github.com/SeleniumHQseleniumhq.github.io
+
+go 1.20
+
+require github.com/google/docsy v0.6.0 // indirect
diff --git a/website_and_docs/go.sum b/website_and_docs/go.sum
@@ -0,0 +1,5 @@
+github.com/FortAwesome/Font-Awesome v0.0.0-20220831210243-d3a7818c253f/go.mod h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.6.0 h1:43bVF18t2JihAamelQjjGzx1vO2ljCilVrBgetCA8oI=
+github.com/google/docsy v0.6.0/go.mod h1:VKKLqD8PQ7AglJc98yBorATfW7GrNVsn0kGXVYF6G+M=
+github.com/google/docsy/dependencies v0.6.0/go.mod h1:EDGc2znMbGUw0RW5kWwy2oGgLt0iVXBmoq4UOqstuNE=
+github.com/twbs/bootstrap v4.6.2+incompatible/go.mod h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git a/website_and_docs/hugo.toml b/website_and_docs/hugo.toml
@@ -3,9 +3,6 @@ title = "Selenium"
 
 enableRobotsTXT = true
 
-# Hugo allows theme composition (and inheritance). The precedence is from left to right.
-theme = ["docsy"]
-
 # Will give values to .Lastmod etc.
 enableGitInfo = true
 #ignoreErrors = ["error-remote-getjson"] 
@@ -79,7 +76,20 @@ description = "Selenium automates browsers. That's it!"
 languageName ="Other"
 weight = 5
 
-
+# Import docsy theme as module
+[module]
+  proxy = "direct"
+  # uncomment line below for temporary local development of module
+  # replacements = "github.com/google/docsy -> ../../docsy"
+  [module.hugoVersion]
+    extended = true
+    min = "0.73.0"
+  [[module.imports]]
+    path = "github.com/google/docsy"
+    disable = false
+  [[module.imports]]
+    path = "github.com/google/docsy/dependencies"
+    disable = false
 
 [markup]
   [markup.goldmark]
diff --git a/website_and_docs/package.json b/website_and_docs/package.json
@@ -11,6 +11,6 @@
   "devDependencies": {
     "autoprefixer": "^10.2.6",
     "postcss": "^8.3.6",
-    "postcss-cli": "^8.3.1"
+    "postcss-cli": "^10.1.0"
   }
 }
diff --git a/website_and_docs/themes/docsy b/website_and_docs/themes/docsy

Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-[submodule "website_and_docs/themes/docsy"]`
`2`		`- path = website_and_docs/themes/docsy`
`3`		`- url = https://github.com/google/docsy.git`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +module github.com/SeleniumHQseleniumhq.github.io
++
 +go 1.20
++
 +require github.com/google/docsy v0.6.0 // indirect