From 472cccc83f18b828b0d98d48954bb7fd39b995c4 Mon Sep 17 00:00:00 2001 From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com> Date: Mon, 16 Sep 2024 20:55:03 +0200 Subject: [PATCH 1/3] Deploy older version --- .github/workflows/pr-deploy-and-comment.yml | 6 +++--- Makefile | 3 +++ config.toml | 1 - layouts/partials/head.html | 8 -------- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.github/workflows/pr-deploy-and-comment.yml b/.github/workflows/pr-deploy-and-comment.yml index d38c7a9cf9..1621609aee 100644 --- a/.github/workflows/pr-deploy-and-comment.yml +++ b/.github/workflows/pr-deploy-and-comment.yml @@ -17,11 +17,11 @@ jobs: fetch-depth: 0 - name: Setup Hugo - uses: peaceiris/actions-hugo@v2 + uses: peaceiris/actions-hugo@v2 with: - hugo-version: 'latest' + hugo-version: 'v0.100.0' extended: true - + - name: Temp config run: | echo url_latest_version = \"https://docs-test.viam.dev/${{ github.sha }}/public\" > config_pr.toml diff --git a/Makefile b/Makefile index fa9868c6c7..280c0daa1d 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ build-prod: clean setup build-pr: clean setup hugo $(PR_OPTIONS) +build-pr-no-clean: setup + hugo $(PR_OPTIONS) + serve-prod: setup hugo server $(PROD_OPTIONS) $(SERVE_OPTIONS) diff --git a/config.toml b/config.toml index 6fd408ae12..0b58148c0b 100644 --- a/config.toml +++ b/config.toml @@ -31,7 +31,6 @@ anchor = "smart" [languages] [languages.en] title = "Viam Documentation" -description = "Viam Documentation" languageName ="English" weight = 1 diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 30e6f2513e..a64d2b69b7 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -45,11 +45,3 @@ {{ partial "hooks/head-end.html" . -}} -{{/* To comply with GDPR, cookie consent scripts places in head-end must execute before Google Analytics is enabled */ -}} -{{ if hugo.IsProduction -}} - {{ if hasPrefix .Site.GoogleAnalytics "G-" -}} - {{ template "_internal/google_analytics.html" . -}} - {{ else -}} - {{ template "_internal/google_analytics_async.html" . -}} - {{ end -}} -{{ end -}} From c75ba1e325115c0b6a7d873caedfc4a56445137b Mon Sep 17 00:00:00 2001 From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com> Date: Wed, 16 Oct 2024 18:29:32 +0200 Subject: [PATCH 2/3] Update .github/workflows/pr-deploy-and-comment.yml --- .github/workflows/pr-deploy-and-comment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr-deploy-and-comment.yml b/.github/workflows/pr-deploy-and-comment.yml index 1621609aee..2f58ef234b 100644 --- a/.github/workflows/pr-deploy-and-comment.yml +++ b/.github/workflows/pr-deploy-and-comment.yml @@ -22,6 +22,7 @@ jobs: hugo-version: 'v0.100.0' extended: true + - name: Temp config run: | echo url_latest_version = \"https://docs-test.viam.dev/${{ github.sha }}/public\" > config_pr.toml From b4e82915499c535cf20ef5b728e37537e8d1241b Mon Sep 17 00:00:00 2001 From: Naomi Pentrel <5212232+npentrel@users.noreply.github.com> Date: Thu, 17 Oct 2024 18:02:47 +0200 Subject: [PATCH 3/3] Update .github/workflows/pr-deploy-and-comment.yml --- .github/workflows/pr-deploy-and-comment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/pr-deploy-and-comment.yml b/.github/workflows/pr-deploy-and-comment.yml index 2f58ef234b..1621609aee 100644 --- a/.github/workflows/pr-deploy-and-comment.yml +++ b/.github/workflows/pr-deploy-and-comment.yml @@ -22,7 +22,6 @@ jobs: hugo-version: 'v0.100.0' extended: true - - name: Temp config run: | echo url_latest_version = \"https://docs-test.viam.dev/${{ github.sha }}/public\" > config_pr.toml