Skip to content

Commit c55ff39

Browse files
Merge branch 'main' into DOCSS-1930-unregistered-users
2 parents 084c272 + 58e5639 commit c55ff39

File tree

8 files changed

+19
-5
lines changed

8 files changed

+19
-5
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
* @circleci/docs @circleci/docs-friends @circleci/lifecycle @circleci/product-mgmt-product-experience
1+
* @circleci/docs @circleci/docs-friends @circleci/webex @circleci/product-mgmt-product-experience
22

antora-playbook.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ asciidoc:
5151
serverversion48: 4.8.2
5252
serverversion: 3.4.8
5353
terraformversion: 0.15.4
54-
kubernetesversions: 1.26 - 1.31
5554
kubectlversion: 1.19
5655
helmversion: 3.9.2
5756
helmdiffversion: 3.5.0

docs/guides/modules/orchestrate/pages/github-trigger-event-options.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ All pipelines triggered by link:https://docs.github.com/en/webhooks/webhook-even
101101
----
102102
workflows:
103103
my-workflow:
104-
when: pipeline.event.name == "api" or pipeline.event.name == 'push' or (pipeline.event.name == "pull_request" and pipeline.event.github.pull_request.draft == false))
105-
jobs:
106-
- myjob
104+
when: pipeline.event.name == "api" or pipeline.event.name == "push" or (pipeline.event.name == "pull_request" and pipeline.event.github.pull_request.draft == false)
105+
jobs:
106+
- myjob
107107
----
108108
+
109109
** The condition `pipeline.event.github.pull_request.draft == false` excludes draft PRs from triggering the workflow.

docs/server-admin-4.4/antora.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ name: server-admin
22
title: Server
33
version: server-4.4
44
display_version: Server 4.4
5+
asciidoc:
6+
attributes:
7+
kubernetesversions: 1.26 - 1.31
58
nav:
69
- modules/ROOT/nav.adoc

docs/server-admin-4.5/antora.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ name: server-admin
22
title: Server
33
version: server-4.5
44
display_version: Server 4.5
5+
asciidoc:
6+
attributes:
7+
kubernetesversions: 1.26 - 1.31
58
nav:
69
- modules/ROOT/nav.adoc

docs/server-admin-4.6/antora.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ name: server-admin
22
title: Server
33
version: server-4.6
44
display_version: Server 4.6
5+
asciidoc:
6+
attributes:
7+
kubernetesversions: 1.26 - 1.31
58
nav:
69
- modules/ROOT/nav.adoc

docs/server-admin-4.7/antora.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ name: server-admin
22
title: Server
33
version: server-4.7
44
display_version: Server 4.7
5+
asciidoc:
6+
attributes:
7+
kubernetesversions: 1.31 - 1.33
58
nav:
69
- modules/ROOT/nav.adoc

docs/server-admin-4.8/antora.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@ name: server-admin
22
title: Server
33
version: server-4.8
44
display_version: Server 4.8
5+
asciidoc:
6+
attributes:
7+
kubernetesversions: 1.31 - 1.33
58
nav:
69
- modules/ROOT/nav.adoc

0 commit comments

Comments
 (0)