From 9764ab2b52d5d455b411910382669a714d15ef7a Mon Sep 17 00:00:00 2001 From: Stephen Lewis Date: Thu, 31 Oct 2024 10:47:43 -0700 Subject: [PATCH 1/2] Updated hugo version and recommended pinned installation --- .github/workflows/repository-documentation-deploy.yml | 2 +- .github/workflows/repository-documentation-test.yml | 2 +- docs/README.md | 5 ++++- docs/go.mod | 2 +- docs/go.sum | 2 ++ 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/repository-documentation-deploy.yml b/.github/workflows/repository-documentation-deploy.yml index 630b49fdcd8a..a891aaac863a 100644 --- a/.github/workflows/repository-documentation-deploy.yml +++ b/.github/workflows/repository-documentation-deploy.yml @@ -21,7 +21,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@16361eb4acea8698b220b76c0d4e84e1fd22c61d # v2.6.0 with: - hugo-version: '0.115.0' + hugo-version: '0.136.5' extended: true - name: Build diff --git a/.github/workflows/repository-documentation-test.yml b/.github/workflows/repository-documentation-test.yml index ea15e4aa3188..f6359d3b9071 100644 --- a/.github/workflows/repository-documentation-test.yml +++ b/.github/workflows/repository-documentation-test.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Hugo uses: peaceiris/actions-hugo@16361eb4acea8698b220b76c0d4e84e1fd22c61d # v2.6.0 with: - hugo-version: '0.115.0' + hugo-version: '0.136.5' extended: true - name: Build diff --git a/docs/README.md b/docs/README.md index cbeb9275d177..a73f37b50479 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,7 +2,10 @@ The docsite is generated using [Hugo](https://gohugo.io/) and hosted using Githu To view locally: -1. [Install Hugo](https://gohugo.io/installation/) +1. Install Hugo v0.136.5 + ```bash + CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@v0.136.5 + ``` 2. Run `hugo server` inside the `docs` directory 3. Visit http://localhost:1313/magic-modules/ to view the docs diff --git a/docs/go.mod b/docs/go.mod index 8d0779b9cb98..66387271b015 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -3,7 +3,7 @@ module github.com/GoogleCloudPlatform/magic-modules/docs go 1.21 require ( - github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0 // indirect + github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb // indirect github.com/h-enk/doks-child-theme v0.5.0 // indirect github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930 // indirect ) diff --git a/docs/go.sum b/docs/go.sum index daa3986d8c39..2a89ee02d175 100644 --- a/docs/go.sum +++ b/docs/go.sum @@ -2,6 +2,8 @@ github.com/alex-shpak/hugo-book v0.0.0-20221111100854-d5b75f4fb3aa h1:VthswmcR+7 github.com/alex-shpak/hugo-book v0.0.0-20221111100854-d5b75f4fb3aa/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds= github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0 h1:Bj/rhvEOix4TXwbzlZttiIi+5fTOqT3aQs1zMsprIXQ= github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds= +github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb h1:cP93DhBd5vM1Mt2qOFzhOUvyribG6yuKz6G4nmgyQrw= +github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds= github.com/h-enk/doks-child-theme v0.5.0 h1:OrLbcGv6GfhDMs8O2OK93e0hUMvV1aygJWeAdKMcdiU= github.com/h-enk/doks-child-theme v0.5.0/go.mod h1:SCLBJIX7W4LH6rbaY9v31i1fwk0DRYoVwDWNMiRpE78= github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930 h1:HH3nIivNlAVSYE9dvB0MD/cWunI1FpN6RDS6FziSFcs= From 75745907e7b8cb5a95b87b561b8b0c9b06d03b9d Mon Sep 17 00:00:00 2001 From: Stephen Lewis Date: Fri, 1 Nov 2024 08:58:47 -0700 Subject: [PATCH 2/2] upgrade to go 1.23.0 --- docs/go.mod | 6 ++---- docs/go.sum | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/docs/go.mod b/docs/go.mod index 66387271b015..accdfed45c78 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,9 +1,7 @@ module github.com/GoogleCloudPlatform/magic-modules/docs -go 1.21 +go 1.23 require ( - github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb // indirect - github.com/h-enk/doks-child-theme v0.5.0 // indirect - github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930 // indirect + github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb ) diff --git a/docs/go.sum b/docs/go.sum index 2a89ee02d175..ccafd3dad696 100644 --- a/docs/go.sum +++ b/docs/go.sum @@ -1,10 +1,2 @@ -github.com/alex-shpak/hugo-book v0.0.0-20221111100854-d5b75f4fb3aa h1:VthswmcR+7NtpamidIRuFq+8JRAz4v+s7xVJ0MmeLqM= -github.com/alex-shpak/hugo-book v0.0.0-20221111100854-d5b75f4fb3aa/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds= -github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0 h1:Bj/rhvEOix4TXwbzlZttiIi+5fTOqT3aQs1zMsprIXQ= -github.com/alex-shpak/hugo-book v0.0.0-20230424134111-d86d5e70c7c0/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds= github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb h1:cP93DhBd5vM1Mt2qOFzhOUvyribG6yuKz6G4nmgyQrw= github.com/alex-shpak/hugo-book v0.0.0-20240518104843-e104a11f42fb/go.mod h1:L4NMyzbn15fpLIpmmtDg9ZFFyTZzw87/lk7M2bMQ7ds= -github.com/h-enk/doks-child-theme v0.5.0 h1:OrLbcGv6GfhDMs8O2OK93e0hUMvV1aygJWeAdKMcdiU= -github.com/h-enk/doks-child-theme v0.5.0/go.mod h1:SCLBJIX7W4LH6rbaY9v31i1fwk0DRYoVwDWNMiRpE78= -github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930 h1:HH3nIivNlAVSYE9dvB0MD/cWunI1FpN6RDS6FziSFcs= -github.com/theNewDynamic/gohugo-theme-ananke v0.0.0-20221031153459-b393088d0930/go.mod h1:yY14BLqqh5G61rO81YcJKMHY1rClY5iIiUK+K2JKSUM=