Merge pull request circleci#4394 from circleci/more-logic-examples

sulami · web-flow · commit 0d1e75b7b76a · 2020-05-20T11:39:03.000+02:00
diff --git a/jekyll/_cci2/configuration-cookbook.md b/jekyll/_cci2/configuration-cookbook.md
@@ -65,7 +65,7 @@ Configuration Recipe | Description
 [Using Amazon Elastic Container Service for Kubernetes (Amazon EKS)](#using-amazon-elastic-container-service-for-kubernetes-amazon-eks) | This section describes how you can use the Amazon ECS service for Kubernetes for Kubernetes-related tasks and operations.
 [Deploying Applications to Heroku](#deploying-applications-to-heroku) | This section describes how you can deploy application to the Heroku platform using the CircleCI Heroku orb.
 [Enabling Custom Slack Notifications in CircleCI Jobs](#enabling-custom-slack-notifications-in-circleci-jobs) | This section describes how you can enable customized Slack notifications in CircleCI jobs.
-[Selecting a Workflow With a Pipeline Parameter](#selecting-a-workflow-with-a-pipeline-parameter) | This section describes how you can use pipeline parameters to run different workflows.
+[Using Logic in Configuration](#using-logic-in-configuration) | This section describes how you can use pipeline values & parameters to select the work to perform.
 
 ## Deploying Software Changes to Amazon ECS
 
@@ -1131,7 +1131,9 @@ Notice in the example that the job is run and a Slack status alert is sent to yo
 
 For more detailed information about this orb and its functionality, refer to the Slack orb in the [CircleCI Orb Registry](https://circleci.com/orbs/registry/orb/circleci/slack).
 
-## Selecting a Workflow With a Pipeline Parameter
+## Using Logic in Configuration
+
+### Selecting a Workflow With a Pipeline Parameter
 
 If you want to be able to trigger custom workflows manually via the API, but still run a workflow on every push, you can use pipeline parameters to decide which workflows to run.
 
@@ -1172,3 +1174,28 @@ workflows:
 ```
 
 The `action` parameter will default to `build` on pushes, but you can supply a different value to select a different workflow to run, like `report`.
+
+### Branch-filtering for Job Steps
+
+Branch filtering has previously only been available for workflows, but with compile-time logic statements, you can implement it for job steps as well.
+
+```yaml
+version: 2.1
+
+jobs:
+  my-job:
+    docker:
+      - image: cimg/base:stable
+    steps:
+      - checkout
+      - when:
+          condition:
+            equal: [ master, << pipeline.git.branch >> ]
+          steps:
+            - run: echo "I am on master"
+
+workflows:
+  my-workflow:
+    jobs:
+      - my-job
+```
