Skip to content

Commit bbea67f

Browse files
Merge branch 'main' into DOCSS-1918-templates
2 parents 622108a + ebab095 commit bbea67f

File tree

18 files changed

+485
-158
lines changed

18 files changed

+485
-158
lines changed
594 KB
Loading
1.02 MB
Loading
312 KB
Loading
146 KB
Loading
789 KB
Loading
618 KB
Loading
621 KB
Loading

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
| Release Notes
99

1010
| `26.0.0`
11-
| Xcode 26.0 Beta 7 (17A5305k)
11+
| Xcode 26.0 GA (17A324)
1212
| 15.6
1313
a| `m4pro.medium` +
1414
`m4pro.large`
15-
| link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15636/manifest.txt[Installed software]
16-
| link:https://circleci.com/changelog/xcode-26-beta-7-available/[Release Notes]
15+
| link:https://circle-macos-docs.s3.amazonaws.com/image-manifest/v15723/manifest.txt[Installed software]
16+
| link:https://circleci.com/changelog/xcode-26-ga-available/[Release Notes]
1717

1818
| `16.4.0`
1919
| Xcode 16.4 GA (16F6)

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,13 @@ a| * GitLab: push, merge request
421421
| image:guides:ROOT:icons/check.svg[check icon, role="no-border"]
422422
| image:guides:ROOT:icons/cancel.svg[cancel icon, role="no-border"]
423423

424+
| `pipeline.event.github.pull_request.merged`
425+
| GitHub App
426+
| Boolean
427+
| A boolean value indicating whether the pull request is has been merged. Only populated for pipelines triggered xref:guides:orchestrate:github-trigger-event-options.adoc#supported-trigger-options[by pull request events] (`pipeline.event.name = "pull_request"`).
428+
| image:guides:ROOT:icons/check.svg[check icon, role="no-border"]
429+
| image:guides:ROOT:icons/cancel.svg[cancel icon, role="no-border"]
430+
424431
| `pipeline.deploy.component_name`
425432
| GitHub App
426433
| String

docs/guides/modules/deploy/pages/configure-deploy-markers.adoc

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,14 @@ jobs:
4141
deploy-my-service:
4242
executor: some-executor
4343
steps:
44-
- run: circleci run release plan <deploy-name> --environment-name=<some-environment-name> --component-name=<some-component-name> --target-version=<some-version-name> --namespace=<some-namespace>
44+
- run:
45+
name: Plan deployment
46+
command: |
47+
circleci run release plan <deploy-name> \
48+
--environment-name=<some-environment-name> \
49+
--component-name=<some-component-name> \
50+
--target-version=<some-version-name> \
51+
--namespace=<some-namespace>
4552
----
4653

4754
In this example, note the following flags and options:
@@ -205,7 +212,9 @@ jobs:
205212
- checkout
206213
- run:
207214
name: Plan deployment
208-
command: circleci run release plan --target-version=<some-version-name>
215+
command: |
216+
circleci run release plan <deploy-name> \
217+
--target-version=<some-version-name>
209218
- run:
210219
name: Perform deployment
211220
command: <your-deployment-logic>
@@ -278,7 +287,13 @@ jobs:
278287
...
279288
(existing deployment commands)
280289
...
281-
- run: circleci run release log --environment-name=<some-environment-name> --component-name=<some-component-name> --target-version=<some-version-name>
290+
- run:
291+
name: Log release
292+
command: |
293+
circleci run release log \
294+
--environment-name=<some-environment-name> \
295+
--component-name=<some-component-name> \
296+
--target-version=<some-version-name>
282297
----
283298

284299
** The `--environment-name` flag specifies the target environment. If the environment does not exist, it will be created.

0 commit comments

Comments
 (0)