From a34c8f27499de56a0b5683e0cd6de2374e32ea9c Mon Sep 17 00:00:00 2001 From: Simon Schrottner Date: Tue, 28 Feb 2023 10:48:43 +0100 Subject: [PATCH 1/3] docs: change Development url We thought we could have a nicer url with `dev.` but it seems like this is not working (or at least we did not manage). As this is not mission critical we change it to simply use the branch name, which works, and in fact needs lesser configuration. Additionally fixing other urls too Signed-off-by: Simon Schrottner --- docs/config/_default/params.yaml | 8 +++++--- docs/config/main/params.yaml | 10 ++++++++++ docs/config/production/params.yaml | 2 +- netlify.toml | 2 ++ 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 docs/config/main/params.yaml diff --git a/docs/config/_default/params.yaml b/docs/config/_default/params.yaml index eb774a5027..bdf63e343d 100644 --- a/docs/config/_default/params.yaml +++ b/docs/config/_default/params.yaml @@ -5,6 +5,8 @@ github_subdir: docs versions: - url: /docs/ - version: development - - url: https://lifecycle.keptn.sh - version: production + version: branch-preview + - url: https://main.lifecycle-test.keptn.sh/docs + version: main + - url: https://lifecycle-test.keptn.sh/docs + version: latest diff --git a/docs/config/main/params.yaml b/docs/config/main/params.yaml new file mode 100644 index 0000000000..36ad904a9d --- /dev/null +++ b/docs/config/main/params.yaml @@ -0,0 +1,10 @@ +github_branch: main +github_project_repo: https://github.com/keptn/lifecycle-toolkit +github_repo: https://github.com/keptn/lifecycle-toolkit +github_subdir: docs + +versions: + - url: /docs/ + version: development + - url: https://lifecycle-test.keptn.sh/docs + version: latest diff --git a/docs/config/production/params.yaml b/docs/config/production/params.yaml index 8b55de75d4..0bbe369e48 100644 --- a/docs/config/production/params.yaml +++ b/docs/config/production/params.yaml @@ -1,4 +1,4 @@ versions: - - url: https://dev.lifecycle-test.keptn.sh + - url: https://main.lifecycle-test.keptn.sh/docs version: development github_branch: pages diff --git a/netlify.toml b/netlify.toml index 39beb71244..dd670f8faf 100644 --- a/netlify.toml +++ b/netlify.toml @@ -10,8 +10,10 @@ HUGO_VERSION = "0.105.0" HUGO_ENABLEGITINFO = "true" [context.deploy-preview] +HUGO_ENV = "development" [context.branch-deploy] +HUGO_ENV = "main" [context.production.environment] HUGO_ENV = "production" From 046c2f9a1f38494af0d33eacb7059ccacf2395bc Mon Sep 17 00:00:00 2001 From: Simon Schrottner Date: Wed, 1 Mar 2023 12:10:51 +0100 Subject: [PATCH 2/3] rename `main` to `staging` for hugo Signed-off-by: Simon Schrottner --- docs/config/main/params.yaml | 10 ---------- docs/config/staging/params.yaml | 5 +++++ netlify.toml | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 docs/config/main/params.yaml create mode 100644 docs/config/staging/params.yaml diff --git a/docs/config/main/params.yaml b/docs/config/main/params.yaml deleted file mode 100644 index 36ad904a9d..0000000000 --- a/docs/config/main/params.yaml +++ /dev/null @@ -1,10 +0,0 @@ -github_branch: main -github_project_repo: https://github.com/keptn/lifecycle-toolkit -github_repo: https://github.com/keptn/lifecycle-toolkit -github_subdir: docs - -versions: - - url: /docs/ - version: development - - url: https://lifecycle-test.keptn.sh/docs - version: latest diff --git a/docs/config/staging/params.yaml b/docs/config/staging/params.yaml new file mode 100644 index 0000000000..a2e4aa0d5a --- /dev/null +++ b/docs/config/staging/params.yaml @@ -0,0 +1,5 @@ +versions: + - url: /docs/ + version: development + - url: https://lifecycle-test.keptn.sh/docs + version: latest diff --git a/netlify.toml b/netlify.toml index dd670f8faf..b215e761a9 100644 --- a/netlify.toml +++ b/netlify.toml @@ -13,7 +13,7 @@ HUGO_ENABLEGITINFO = "true" HUGO_ENV = "development" [context.branch-deploy] -HUGO_ENV = "main" +HUGO_ENV = "staging" [context.production.environment] HUGO_ENV = "production" From 8d7fb073d277a68e11058606f774d98512a181b9 Mon Sep 17 00:00:00 2001 From: Simon Schrottner Date: Wed, 8 Mar 2023 09:59:15 +0100 Subject: [PATCH 3/3] changing wording Signed-off-by: Simon Schrottner --- docs/config/_default/params.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/config/_default/params.yaml b/docs/config/_default/params.yaml index bdf63e343d..b29294f096 100644 --- a/docs/config/_default/params.yaml +++ b/docs/config/_default/params.yaml @@ -7,6 +7,6 @@ versions: - url: /docs/ version: branch-preview - url: https://main.lifecycle-test.keptn.sh/docs - version: main + version: development - url: https://lifecycle-test.keptn.sh/docs version: latest