This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch production
in repository https://gitbox.apache.org/repos/asf/parquet-site.git
The following commit(s) were added to refs/heads/production by this push:
new 6d31e2a Upgrading hugo (v0.124.1 -> v0.152.0) and docsy (v0.9.0 ->
v0.12.0) (#132)
6d31e2a is described below
commit 6d31e2a7ad7ad09519ebd3145d8695b99fdd3360
Author: Vinoo Ganesh <[email protected]>
AuthorDate: Wed Nov 12 06:07:43 2025 -0500
Upgrading hugo (v0.124.1 -> v0.152.0) and docsy (v0.9.0 -> v0.12.0) (#132)
* Upgrading hugo and docsy
* Fixing CI
* Adding in bootstrap
* Vendor files
* adding go to CI workflow
---
.github/workflows/deploy.yml | 10 ++++-
.gitignore | 1 +
Dockerfile | 6 +--
go.mod | 6 ++-
go.sum | 11 +++--
hugo.toml | 96 ++++++++++++++++++++++++++------------------
package.json | 1 +
7 files changed, 83 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b704c24..ed5abeb 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -38,9 +38,14 @@ jobs:
- name: Setup Hugo
uses: peaceiris/actions-hugo@v2
with:
- hugo-version: '0.124.1'
+ hugo-version: '0.152.0'
extended: true
+ - name: Setup Go
+ uses: actions/setup-go@v5
+ with:
+ go-version: '1.22'
+
- uses: actions/setup-node@v4
with:
node-version: '20'
@@ -55,6 +60,9 @@ jobs:
- run: npm install
+ - name: Download Hugo modules
+ run: hugo mod get
+
- name: Build
run: hugo --minify --panicOnWarning
diff --git a/.gitignore b/.gitignore
index b89d6df..4e348da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ resources/
node_modules/
package-lock.json
.hugo_build.lock
+_vendor/
*~
# intellij files
diff --git a/Dockerfile b/Dockerfile
index 2ed3774..3c456a1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,9 +34,9 @@ RUN apt-get update
RUN apt-get install wget git -y xz-utils
# Install extended version of hugo to /hugo
-# See releases https://github.com/gohugoio/hugo/releases/tag/v0.124.1
-# Note, if on amd64 use
https://github.com/gohugoio/hugo/releases/download/v0.124.1/hugo_extended_0.124.1_linux-amd64.tar.gz
-RUN wget -O -
https://github.com/gohugoio/hugo/releases/download/v0.124.1/hugo_extended_0.124.1_linux-arm64.tar.gz
| tar xz
+# See releases https://github.com/gohugoio/hugo/releases/tag/v0.152.0
+# Note, if on amd64 use
https://github.com/gohugoio/hugo/releases/download/v0.152.0/hugo_extended_0.152.0_linux-amd64.tar.gz
+RUN wget -O -
https://github.com/gohugoio/hugo/releases/download/v0.152.0/hugo_extended_0.152.0_linux-arm64.tar.gz
| tar xz
RUN mv /hugo /usr/local/bin/hugo
# install golang to /go
diff --git a/go.mod b/go.mod
index 90cb541..6c4ad7c 100644
--- a/go.mod
+++ b/go.mod
@@ -2,4 +2,8 @@ module github.com/apache/parquet-site
go 1.12
-require github.com/google/docsy v0.9.1 // indirect
+require (
+ github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3
// indirect
+ github.com/google/docsy v0.12.0 // indirect
+ github.com/twbs/bootstrap v5.3.8+incompatible // indirect
+)
diff --git a/go.sum b/go.sum
index 645c0da..6a51e65 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,7 @@
-github.com/FortAwesome/Font-Awesome v0.0.0-20240108205627-a1232e345536/go.mod
h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
-github.com/google/docsy v0.9.1 h1:+jqges1YCd+yHeuZ1BUvD8V8mEGVtPxULg5j/vaJ984=
-github.com/google/docsy v0.9.1/go.mod
h1:saOqKEUOn07Bc0orM/JdIF3VkOanHta9LU5Y53bwN2U=
-github.com/twbs/bootstrap v5.2.3+incompatible/go.mod
h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3
h1:/iluJkJiyTAdnqrw3Yi9rH2HNHhrrtCmj8VJe7I6o3w=
+github.com/FortAwesome/Font-Awesome v0.0.0-20241216213156-af620534bfc3/go.mod
h1:IUgezN/MFpCDIlFezw3L8j83oeiIuYoj28Miwr/KUYo=
+github.com/google/docsy v0.12.0 h1:CddZKL39YyJzawr8GTVaakvcUTCJRAAYdz7W0qfZ2P4=
+github.com/google/docsy v0.12.0/go.mod
h1:1bioDqA493neyFesaTvQ9reV0V2vYy+xUAnlnz7+miM=
+github.com/twbs/bootstrap v5.3.6+incompatible/go.mod
h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
+github.com/twbs/bootstrap v5.3.8+incompatible
h1:eK1fsXP7R/FWFt+sSNmmvUH9usPocf240nWVw7Dh02o=
+github.com/twbs/bootstrap v5.3.8+incompatible/go.mod
h1:fZTSrkpSf0/HkL0IIJzvVspTt1r9zuf7XlZau8kpcY0=
diff --git a/hugo.toml b/hugo.toml
index cea8c67..ae94c74 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -18,10 +18,10 @@ enableGitInfo = true
# Link to Github (top right link in navbar)
[[menu.main]]
- name = "GitHub"
- weight = 50
- url = "https://github.com/apache/parquet-format/";
- pre = "<i class='fab fa-github'></i>"
+name = "GitHub"
+weight = 50
+url = "https://github.com/apache/parquet-format/";
+pre = "<i class='fab fa-github'></i>"
# Configure how URLs look like per section.
[permalinks]
@@ -38,12 +38,12 @@ latexDashes = true
[imaging]
resampleFilter = "CatmullRom"
quality = 75
-anchor = "smart"
+anchor = "Smart"
# Language configuration
[languages]
[languages.en]
-languageName ="English"
+languageName = "English"
# Weight used for sorting.
weight = 1
[languages.en.params]
@@ -54,14 +54,14 @@ contentDir = "content/en"
weight = 1
[markup]
- [markup.goldmark]
- [markup.goldmark.renderer]
- unsafe = true
- [markup.highlight]
- # See a complete list of available styles at
https://xyproto.github.io/splash/docs/all.html
- style = "tango"
- # Uncomment if you want your chosen highlight style used for code blocks
without a specified language
- # guessSyntax = "true"
+[markup.goldmark]
+[markup.goldmark.renderer]
+unsafe = true
+[markup.highlight]
+# See a complete list of available styles at
https://xyproto.github.io/splash/docs/all.html
+style = "tango"
+# Uncomment if you want your chosen highlight style used for code blocks
without a specified language
+# guessSyntax = "true"
# Everything below this are Site Params
@@ -97,7 +97,7 @@ url_latest_version = "https://parquet.apache.org";
# Repository configuration (URLs for in-page links to opening issues and
suggesting changes)
github_repo = "https://github.com/apache/parquet-site";
-github_branch= "production"
+github_branch = "production"
# Comment out to disable search.
# gcs_engine_id = "7e3f91e3eadecceaa"
@@ -148,33 +148,51 @@ enable = false
[params.links]
# End user relevant links. These will show up on left side of footer and in
the community page if you have one.
[[params.links.user]]
- name = "Post to Mailing List"
- url = "mailto:[email protected]";
- icon = "fa fa-envelope"
- desc = "Discussion and help from your fellow users"
+name = "Post to Mailing List"
+url = "mailto:[email protected]";
+icon = "fa fa-envelope"
+desc = "Discussion and help from your fellow users"
[[params.links.user]]
- name = "Subscribe to Mailing List"
- url = "mailto:[email protected]";
- icon = "fa fa-envelope-circle-check"
- desc = "Subscribe to the mailing list to participate."
+name = "Subscribe to Mailing List"
+url = "mailto:[email protected]";
+icon = "fa fa-envelope-circle-check"
+desc = "Subscribe to the mailing list to participate."
[[params.links.user]]
- name = "View Mailing List Archives"
- url = "https://lists.apache.org/[email protected]";
- icon = "fa fa-box-archive"
- desc = "View archives of past discussions."
+name = "View Mailing List Archives"
+url = "https://lists.apache.org/[email protected]";
+icon = "fa fa-box-archive"
+desc = "View archives of past discussions."
# Developer relevant links. These will show up on right side of footer and in
the community page if you have one.
[[params.links.developer]]
- name = "Parquet specification"
- url = "https://github.com/apache/parquet-format";
- icon = "fab fa-github"
- desc = "Parquet specification"
+name = "Parquet specification"
+url = "https://github.com/apache/parquet-format";
+icon = "fab fa-github"
+desc = "Parquet specification"
+
[module]
- # Uncomment the next line to build and serve using local docsy clone
declared in the named Hugo workspace:
- # workspace = "docsy.work"
- [module.hugoVersion]
- extended = true
- min = "0.110.0"
- [[module.imports]]
- path = "github.com/google/docsy"
- disable = false
+# Uncomment the next line to build and serve using local docsy clone declared
in the named Hugo workspace:
+# workspace = "docsy.work"
+[module.hugoVersion]
+extended = true
+min = "0.152.0"
+[[module.imports]]
+path = "github.com/google/docsy"
+disable = false
+# Override mounts to avoid problematic ../../node_modules paths
+[[module.imports.mounts]]
+source = "assets"
+target = "assets"
+[[module.imports.mounts]]
+source = "i18n"
+target = "i18n"
+[[module.imports.mounts]]
+source = "layouts"
+target = "layouts"
+[[module.imports.mounts]]
+source = "static"
+target = "static"
+[[module.imports.mounts]]
+source = "assets/_vendor/bootstrap/scss"
+target = "assets/vendor/bootstrap/scss/vendor"
+# Bootstrap and Font Awesome are imported via Docsy's nested imports (see
Docsy's hugo.yaml lines 49-63)
diff --git a/package.json b/package.json
index 41b70d3..9182502 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"devDependencies": {
"@mermaid-js/mermaid-cli": "^11.4.2",
"autoprefixer": "^10.4.18",
+ "bootstrap": "^5.3.6",
"postcss": "^8.4.35",
"postcss-cli": "^11.0.0"
}
