Skip to content

Commit c410a39

Browse files
authored
Merge branch 'main' into adaptive-testing-improvements
2 parents 5869223 + 8c27aa6 commit c410a39

File tree

10 files changed

+51
-48
lines changed

10 files changed

+51
-48
lines changed

docs/guides/modules/ROOT/partials/execution-resources/xcode-silicon-vm.adoc

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,7 @@ a| `m4pro.medium` +
6464
| `16.1.0`
6565
| Xcode 16.1 (16B40)
6666
| 14.6.1
67-
a| `m4pro.medium` +
68-
`m4pro.large` +
69-
_(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
70-
`m2pro.medium` +
67+
a| `m2pro.medium` +
7168
`m2pro.large` +
7269
`macos.m1.medium.gen1` +
7370
`macos.m1.large.gen1`
@@ -77,10 +74,7 @@ a| `m4pro.medium` +
7774
| `16.0.0`
7875
| Xcode 16.0 (16A242d)
7976
| 14.6.1
80-
a| `m4pro.medium` +
81-
`m4pro.large` +
82-
_(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
83-
`m2pro.medium` +
77+
a| `m2pro.medium` +
8478
`m2pro.large` +
8579
`macos.m1.medium.gen1` +
8680
`macos.m1.large.gen1`
@@ -102,10 +96,7 @@ a| `m4pro.medium` +
10296
| `15.3.0`
10397
| Xcode 15.3 (15E204a)
10498
| 14.3.1
105-
a| `m4pro.medium` +
106-
`m4pro.large` +
107-
_(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
108-
`m2pro.medium` +
99+
a| `m2pro.medium` +
109100
`m2pro.large` +
110101
`macos.m1.medium.gen1` +
111102
`macos.m1.large.gen1`
@@ -115,10 +106,7 @@ a| `m4pro.medium` +
115106
| `15.2.0`
116107
| Xcode 15.2 (15C500b)
117108
| 14.1
118-
a| `m4pro.medium` +
119-
`m4pro.large` +
120-
_(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
121-
`m2pro.medium` +
109+
a| `m2pro.medium` +
122110
`m2pro.large` +
123111
`macos.m1.medium.gen1` +
124112
`macos.m1.large.gen1`
@@ -128,10 +116,7 @@ a| `m4pro.medium` +
128116
| `15.1.0`
129117
| Xcode 15.1 (15C65)
130118
| 14.1
131-
a| `m4pro.medium` +
132-
`m4pro.large` +
133-
_(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
134-
`m2pro.medium` +
119+
a| `m2pro.medium` +
135120
`m2pro.large` +
136121
`macos.m1.medium.gen1` +
137122
`macos.m1.large.gen1`
@@ -193,10 +178,7 @@ a| `m2pro.medium` +
193178
| `13.4.1`
194179
| Xcode 13.4.1 (13F100)
195180
| 12.6.1
196-
a| `m4pro.medium` +
197-
`m4pro.large` +
198-
_(M4 support link:https://circleci.com/changelog/deprecation-of-eol-xcode-versions/[ends on] Nov 7, 2025)_ +
199-
`m2pro.medium` +
181+
a| `m2pro.medium` +
200182
`m2pro.large` +
201183
`macos.m1.medium.gen1` +
202184
`macos.m1.large.gen1`

docs/guides/modules/ROOT/partials/pipelines-and-triggers/pipeline-values.adoc

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,20 @@ d| [.nowrap]#GitHub App#
485485
| [.circle-green]#**Yes**#
486486
| [.circle-red]#**No**#
487487

488+
| `pipeline.event.github.comment.body`
489+
d| [.nowrap]#GitHub App#
490+
| Boolean
491+
| The pull request comment body with leading/trailing whitespace removed, if a pipeline was triggered via PR comment. For pipelines triggered in other ways, this value is undefined.
492+
| [.circle-green]#**Yes**#
493+
| [.circle-red]#**No**#
494+
495+
| `pipeline.event.github.sender.type`
496+
d| [.nowrap]#GitHub App#
497+
| String
498+
| The type of GitHub user that emitted the event triggering the pipeline. Possible values are `User`, `Organization`, and `Bot`.
499+
| [.circle-green]#**Yes**#
500+
| [.circle-red]#**No**#
501+
488502
| `pipeline.deploy.component_name`
489503
d| [.nowrap]#GitHub App#
490504
| String

docs/guides/modules/optimize/pages/use-the-circleci-cli-to-split-tests.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ jobs:
317317
- run:
318318
name: Run tests
319319
command: |
320-
circleci tests glob 'lib/**/*_test.exs'
320+
circleci tests glob 'test/**/*_test.exs'
321321
| circleci tests run --command='xargs -n1 echo > test_file_paths.txt'
322322

323323
mix ecto.setup --quiet

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ GitHub App triggers allow you to define the work to do (pipeline) when an event
5454
* *PR marked ready for review*: Trigger a pipeline when a PR is taken out of draft mode and marked ready for review. See the link:https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=review_requested#pull_request[GitHub docs for pull request review requested].
5555
* *"run-ci" label added to PR*: Trigger a pipeline when a label "run-ci" is added to a PR. See the link:https://docs.github.com/en/webhooks/webhook-events-and-payloads?actionType=labeled#pull_request[GitHub docs for pull request labelled].
5656
* *Pushes to open non-draft PRs*: Trigger a pipeline when there is a push to a branch with an open PR that is not in draft mode.
57+
* *PR comment is exactly "run-ci"*: Trigger a pipeline when the comment "run-ci" is added to a pull request. This works for general PR comments (link:https://docs.github.com/en/webhooks/webhook-events-and-payloads#issue_comment[`issue_comment` events]) and inline code comments (link:https://docs.github.com/en/webhooks/webhook-events-and-payloads#pull_request_review_comment[`pull_request_review_comment` events]). It does *not* work for comments added in the top-level comment field when submitting a review (link:https://docs.github.com/en/webhooks/webhook-events-and-payloads#pull_request_review[`pull_request_review` events]).
5758

5859
NOTE: **Forked pull requests** never trigger GitHub App pipelines.
5960

docs/guides/modules/permissions-authentication/pages/openid-connect-tokens.adoc

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,26 +76,29 @@ The OpenID Connect ID tokens also contain some https://openid.net/specs/openid-c
7676
| Additional claims
7777
| Metadata
7878

79-
| `oidc.circleci.com/project-id`
80-
| The ID of the project in which the job is running. Its value is a string containing a UUID identifying the CircleCI project.
79+
| `oidc.circleci.com/context-ids`
80+
| An array of strings containing UUIDs that identify the context(s) used in the job.
81+
82+
| `oidc.circleci.com/org-id`
83+
| The unique identifier for the organization. Its value is a string containing a UUID identifying the CircleCI organization.
84+
85+
| `oidc.circleci.com/pipeline-definition-id`
86+
| The unique identifier for the pipeline definition that created the pipeline running the workflow. The value is a string containing a UUID identifying the CircleCI pipeline definition. Pipeline definitions are found in your project settings under Project Setup.
8187

8288
| `oidc.circleci.com/pipeline-id`
8389
| The unique identifier for the pipeline that triggered this job. Its value is a string containing a UUID identifying the CircleCI pipeline.
8490

85-
| `oidc.circleci.com/org-id`
86-
| The unique identifier for the organization. Its value is a string containing a UUID identifying the CircleCI organization.
91+
| `oidc.circleci.com/project-id`
92+
| The ID of the project in which the job is running. Its value is a string containing a UUID identifying the CircleCI project.
93+
94+
| `oidc.circleci.com/ssh-rerun`
95+
| A boolean indicating if the CI job is started using the SSH rerun feature.
8796

8897
| `oidc.circleci.com/vcs-origin`
8998
| The URL of the repository that triggered the pipeline. Its value is a string similar to `github.com/organization-123/repo-1`. This is not present for pipelines triggered by custom webhooks.
9099

91100
| `oidc.circleci.com/vcs-ref`
92101
| The reference to the change that triggered the pipeline. Its value is a string similar to `refs/heads/main`. This is not present for pipelines triggered by custom webhooks.
93-
94-
| `oidc.circleci.com/context-ids`
95-
| An array of strings containing UUIDs that identify the context(s) used in the job.
96-
97-
| `oidc.circleci.com/ssh-rerun`
98-
| A boolean indicating if the CI job is started using the SSH rerun feature.
99102
|===
100103
--
101104

docs/guides/modules/test/pages/rerun-failed-tests.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ Ensure you are using `xargs` in your `circleci tests run` command to pass the li
242242
- run:
243243
name: Run tests
244244
command: |
245-
circleci tests glob 'lib/**/*_test.exs'
245+
circleci tests glob 'test/**/*_test.exs'
246246
| circleci tests run --command='xargs -n1 echo > test_file_paths.txt'
247247

248248
mix ecto.setup --quiet

docs/server-admin-4.8/modules/installation/pages/installation-reference.adoc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -893,7 +893,10 @@ performed on the resource.
893893
Dockerhub is assumed to be the image registry unless otherwise specified
894894
eg: registry.example.com/organization/repository
895895

896-
|nomad.clients |object |`+{}+` |
896+
|nomad.clients.mTLS
897+
|object
898+
|`{"CACertificate":"","certificate":""}`
899+
|Configure Nomad client mTLS when using external Nomad servers. Required when `nomad.server.internal: false`. Both `CACertificate` (base64 encoded CA cert to verify server) and `certificate` (base64 encoded client cert for authentication) must be provided.
897900

898901
|nomad.server.gossip.encryption.enabled |bool |`+true+` |
899902

ui/src/css/doc.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@
518518
display: flex !important;
519519
align-items: center;
520520
border: 2px solid transparent;
521-
border-radius: 8px;
521+
border-radius: 12px;
522522
padding: 1rem;
523523
box-sizing: border-box;
524524
padding: 1rem 1rem 0.75rem;
@@ -950,7 +950,7 @@
950950
display: flex !important;
951951
align-items: center;
952952
border: 2px solid transparent;
953-
border-radius: 8px;
953+
border-radius: 12px;
954954
border-color: #1A66F7;
955955
padding: 1rem;
956956
box-sizing: border-box;
@@ -1021,7 +1021,7 @@
10211021
/* Style listing blocks with titles */
10221022
.doc .listingblock > .title {
10231023
background: var(--pre-title-background);
1024-
border-radius: 8px 8px 0 0;
1024+
border-radius: 12px 12px 0 0;
10251025
padding: 0.5em 0.875em;
10261026
margin-bottom: 0;
10271027
position: relative;
@@ -1050,17 +1050,17 @@
10501050

10511051
/* When title is collapsed, adjust the border radius */
10521052
.doc .listingblock > .title.collapsed {
1053-
border-radius: 8px;
1053+
border-radius: 12px;
10541054
}
10551055

10561056
/* When a title is present, adjust the code block border radius */
10571057
.doc .listingblock > .title + .content pre {
1058-
border-radius: 0 0 8px 8px;
1058+
border-radius: 0 0 12px 12px;
10591059
}
10601060

1061-
/* When title is not present, use border-radius: 8px for code blocks */
1061+
/* When title is not present, use border-radius: 12px for code blocks */
10621062
.doc .listingblock > .content pre {
1063-
border-radius: 8px;
1063+
border-radius: 12px;
10641064
}
10651065

10661066
/* Keep existing position relative for the content */
@@ -1073,7 +1073,7 @@
10731073
flex-direction: column;
10741074
align-items: center;
10751075
position: absolute;
1076-
top: 0.25rem;
1076+
top: 0.5rem;
10771077
right: 0.5rem;
10781078
color: var(--pre-annotation-font-color);
10791079
font-family: var(--body-font-family);

ui/src/partials/header-content.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="flex items-center space-x-4 ml-2">
1717
<!--<img src="{{{uiRootPath}}}/img/language-icon.svg" alt="Language Icon" class="h-5 w-5">-->
1818
<img data-page-navigation-toggle src="{{{uiRootPath}}}/img/nav-menu.svg" alt="Navigation Menu Icon" class="h-5 w-5 lg:hidden">
19-
<a href="https://app.circleci.com/" class="hidden md:block bg-slime-green text-dark-green rounded-full px-[16px] border py-[8px] border-operational-green">
19+
<a href="https://app.circleci.com/" class="hidden md:block bg-slime-green text-dark-green rounded-full px-[16px] border py-[8px] border-operational-green font-medium">
2020
Go to Application
2121
</a>
2222
</div>

ui/src/partials/navigation-tree.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</button>
1111
{{/if}}
1212
{{#if (and ./url (not (eq ./url @root.page.url)))}}
13-
<a class="nav-link hover:text-link-on-light {{#if (has-active-child ./items)}}font-medium text-inherit {{/if}}" href="
13+
<a class="nav-link hover:text-link-on-light {{#if (has-active-child ./items)}}font-semibold text-inherit {{/if}}" href="
1414
{{~#if (eq ./urlType 'internal')}}{{{relativize ./url}}}
1515
{{~else}}{{{./url}}}{{~/if}}">{{{./content}}}</a>
1616
{{else}}
17-
<span class="{{#if (has-active-child ./items)}}text-accent-green font-medium text-inherit{{/if}}">{{{./content}}}</span>
17+
<span class="{{#if (has-active-child ./items)}}text-accent-green font-semibold text-inherit{{/if}}">{{{./content}}}</span>
1818
{{/if}}
1919
</div>
2020
{{/if}}

0 commit comments

Comments
 (0)