Skip to content

Commit 1d7cc10

Browse files
Merge pull request circleci#4610 from circleci/update/env-var-name
[WIP] Further explain `env_var_name` parameter type
2 parents 70264c3 + ce78176 commit 1d7cc10

File tree

3 files changed

+490
-458
lines changed

3 files changed

+490
-458
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ GEM
1717
httpclient (~> 2.8, >= 2.8.3)
1818
json (>= 1.5.1)
1919
asciidoctor (2.0.10)
20-
asciidoctor-pdf (1.5.0.rc.3)
20+
asciidoctor-pdf (1.5.3)
2121
asciidoctor (>= 1.5.3, < 3.0.0)
2222
concurrent-ruby (~> 1.1.0)
2323
prawn (~> 2.2.0)
@@ -184,7 +184,7 @@ PLATFORMS
184184

185185
DEPENDENCIES
186186
asciidoctor
187-
asciidoctor-pdf (~> 1.5.0.rc.3)
187+
asciidoctor-pdf (~> 1.5.3)
188188
html-proofer
189189
jekyll (= 3.8.6)
190190
jekyll-algolia (~> 1.0)

jekyll/_cci2/orbs-faq.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ This document describes various questions and technical issues that you may find
2121

2222
* **Question:** What is the difference between commands and jobs?
2323

24-
* **Answer:** Both [commands]({{site.baseurl}}/2.0/reusing-config/#the-commands-key) and [jobs]({{site.baseurl}}/2.0/reusing-config/#authoring-parameterized-jobs) are elements that can be used within orbs. _Commands_ contain one or many [steps]({{site.baseurl}}/2.0/configuration-reference/#steps), which contain the logic of the orb. Commands generally execute some shell code (bash). _Jobs_ are a definition of what steps/commands to run _and_ the [executor]({{site.baseurl}}/2.0/reusing-config/#executors) to run them in. _Commands_ are invoked within jobs. _Jobs_ are orchestrated using _[Workflows]({{site.baseurl}}/2.0/workflows/#workflows-configuration-examples)_.
24+
* **Answer:** Both [commands]({{site.baseurl}}/2.0/reusing-config/#the-commands-key) and [jobs]({{site.baseurl}}/2.0/reusing-config/#authoring-parameterized-jobs) are elements that can be used within orbs. _Commands_ contain one or many [steps]({{site.baseurl}}/2.0/configuration-reference/#steps), which contain the logic of the orb. Commands generally execute some shell code (bash). _Jobs_ are a definition of what steps/commands to run _and_ the [executor]({{site.baseurl}}/2.0/reusing-config/#the-executors-key) to run them in. _Commands_ are invoked within jobs. _Jobs_ are orchestrated using _[Workflows]({{site.baseurl}}/2.0/workflows/#workflows-configuration-examples)_.
2525

2626
## Using Orbs on CircleCI Server
2727

0 commit comments

Comments
 (0)