Skip to content

Commit f40fc4b

Browse files
Merge branch 'main' into external-nomad-clients-mtls-configuration
2 parents 7cc31fa + 1093b49 commit f40fc4b

File tree

4 files changed

+21
-36
lines changed

4 files changed

+21
-36
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/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/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

0 commit comments

Comments
 (0)