Skip to content

Commit 3b5e4e0

Browse files
Merge branch 'main' into move-component-switcher
2 parents 9ac171f + ebff233 commit 3b5e4e0

File tree

6 files changed

+116
-101
lines changed

6 files changed

+116
-101
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ executors:
1818

1919
ruby_executor:
2020
docker:
21-
- image: cimg/ruby:3.4.5
21+
- image: cimg/ruby:3.4.6
2222
working_directory: ~/project
2323

2424
commands:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,9 @@ jobs:
284284
----
285285

286286
This command supports the same optional parameters as the `release plan` command, but does not require a `deploy-name`.
287+
288+
WARNING: If you are deploying to multiple environments from a single workflow, you need to specify the target environment using the `--environment-name` flag. If you are deploying multiple components from a single workflow, you need to specify the component name using the `--component-name` flag.
289+
287290
You can see the command with all optional parameters in the following example:
288291

289292
[,yml]

docs/guides/modules/deploy/pages/set-up-the-circleci-release-agent.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ include::ROOT:partial$deploy/supported-versions.adoc[]
3737

3838
The following table shows a complete list of labels and annotations either required or available for configuring your environment integration. You will be guided to set these up in the in-app setup process. These are not strictly a prerequisite but will be required for the release agent to work correctly.
3939

40+
[.table-scroll]
41+
--
4042
[cols=4*, options="header"]
4143
|===
4244
|
@@ -104,6 +106,7 @@ The following table shows a complete list of labels and annotations either requi
104106
|`false`
105107
|No. Only set if you want to disable the cancel deployment feature for your component.
106108
|===
109+
--
107110

108111

109112
== Set up the CircleCI release agent

0 commit comments

Comments
 (0)