Merge pull request #12 from githubtraining/bdougie

brianamarie · web-flow · commit 8308060f49cb · 2019-11-12T09:58:11.000+01:00
@bdougie's changes
diff --git a/config.yml b/config.yml
@@ -41,7 +41,7 @@ before:
   
 steps: 
 
-   # event: User commits the proper trigger
+   # Step 1: User commits the proper trigger
 - title: Configure a trigger based on labels
   description: Configure the workflow trigger based on an a label being added
   event: pull_request.synchronize
diff --git a/responses/01_label-trigger.md b/responses/01_label-trigger.md
@@ -27,7 +27,7 @@ In a GitHub Actions workflow, the `on` step defines what causes the workflow to
 
 ### :keyboard: Activity: Configure the workflow trigger based on an a label being added
 
-1. Edit this file
+1. Edit the `deploy-staging.yml` file on this branch, or [use this quick link]({{ repoUrl }}/edit/staging-workflow/.github/CHANGETHIS/deploy-staging.yml?) _(We recommend opening the quick link in another tab)_
 2. Change the name of the directory `CHANGETHIS` to `workflows`, so the title of this file with the path is `.github/workflows/deploy-staging.yml`
 3. Edit the contents of this file to trigger on a label
 
diff --git a/responses/02_conditional.md b/responses/02_conditional.md
@@ -18,6 +18,11 @@ Let's put all this together to run our job only when a labeled named "stage" is
 
 ### :keyboard: Activity: Choose the Ubuntu environment for our app
 
+1. Edit the `deploy-staging.yml` file on this branch, or [use this quick link]({{ repoUrl }}/edit/staging-workflow/.github/workflows/deploy-staging.yml?) _(We recommend opening the quick link in another tab)_
+2. Edit the contents of the file to add a conditional
+
+Your results should look like this:
+
 ```yml
 name: Staging deployment
 
diff --git a/responses/03_workflow-steps.md b/responses/03_workflow-steps.md
@@ -29,7 +29,7 @@ The course [_Using GitHub Actions for CI_](https://lab.github.com/githubtraining
 1. Click **Add a new secret** again.
 1. Name the second secret **AWS_SECRET_KEY** and paste the value from the Secret access key generated on AWS.
 1. Click **Add secret**
-1. Back in this pull request, edit the `.github/workflows/deploy-staging.yml` file to use a new action 
+2. Back in this pull request, edit the `.github/workflows/deploy-staging.yml` file to use a new action, or [use this quick link]({{ repoUrl }}/edit/staging-workflow/.github/workflows/deploy-staging.yml?) _(We recommend opening the quick link in another tab)_
     ```yml
     - name: Deploy to AWS
       uses: github/deploy-nodejs@master
diff --git a/responses/05_confirm-aws.md b/responses/05_confirm-aws.md
@@ -12,11 +12,12 @@ Amazon S3 Buckets are a very flexible type of data storage -- they can be config
 
 1. Navigate to the [Amazon S3](https://s3.console.aws.amazon.com/s3/home) service and click on **Create bucket**.
     - See [_Create a Bucket_](https://docs.aws.amazon.com/AmazonS3/latest/gsg/CreatingABucket.html) on AWS documentation for the most detailed instructions.
-1. Name the bucket whatever you'd like, and jot the name down
+1. Name the bucket whatever you'd like, and jot the name down.
 1. Select a region, and jot it down. You'll need it later. These examples use **US West (Oregon)**, also known as **us-west-2**. If you'd like to choose another region, make sure to update the `aws-config.yml` file to match.
 1. For all other options, accept the defaults.
-1. In `.github/aws-config.yml` on this branch, change the value of `s3_bucket:` to match your chosen bucket name. 
-1. In the same file, confirm that the `region:` value matches your chosen region for the S3 bucket.
-1. Commit your changes.
+2. Edit the `.github/aws-config.yml` file on this branch, or [use this quick link]({{ repoUrl }}/edit/aws-configuration/.github/aws-config.yml?). _(We recommend opening the quick link in another tab.)_
+3. Change the value of `s3_bucket:` to match your chosen bucket name.
+4. In the same file, confirm that the `region:` value matches your chosen region for the S3 bucket.
+5. Commit your changes.
 
 I'll respond when I detect a commit on this branch.
diff --git a/responses/09_merge-trigger.md b/responses/09_merge-trigger.md
@@ -10,11 +10,12 @@ Let's create a new workflow that deals specifically with commits to master and h
 
 ### :keyboard: Activity: Write the production deployment trigger on merge to master
 
-1. Rename the file in this pull request to `.github/workflows/deploy-prod.yml`.
-1. Add a `push` trigger.
-1. Add `branches` inside the push block.
-1. Add `- master` inside the branches block.
-1. Commit your changes to this branch. 
+1. Edit the `deploy-prod.yml` file on this branch, or [use this quick link]({{ repoUrl }}/edit/production-deployment-workflow/.github/CHANGETHIS/deploy-prod.yml?) _(We recommend opening the quick link in another tab)_
+2. Rename the file in this pull request to `.github/workflows/deploy-prod.yml`
+3. Add a `push` trigger
+4. Add `branches` inside the push block
+5. Add `- master` inside the branches block
+6. Commit your changes to this branch
 
 The file should look like this when you're finished:
 
diff --git a/responses/10_deploy-prod.md b/responses/10_deploy-prod.md
@@ -12,9 +12,10 @@ In our case, we can match our production environment to be exactly like our stag
 
 ### :keyboard: Commit the steps to the production workflow that allow you to deploy on merge to master
 
-Add a `build` and `deploy` job to the workflow in this PR. It should look like the file below when you are finished. 
+1. Edit the `deploy-prod.yml` file on this branch, or [use this quick link]({{ repoUrl }}/edit/production-deployment-workflow/.github/workflows/deploy-prod.yml?) _(We recommend opening the quick link in another tab)_
+2. Add a `build` and `deploy` job to the workflow
 
-Note that not much has changed from our staging workflow, except for our trigger.
+It should look like the file below when you are finished. Note that not much has changed from our staging workflow, except for our trigger.
 
 ```yml
 name: Production deployment
diff --git a/responses/11_workflow-steps.md b/responses/11_workflow-steps.md
@@ -11,6 +11,7 @@ All of this happens automatically once a pull request is merged!
 
 ### :keyboard: Activity: Write the steps for the production deployment workflow
 
+1. Edit the `deploy-prod.yml` file on this branch, or [use this quick link]({{ repoUrl }}/edit/production-deployment-workflow/.github/workflows/deploy-prod.yml?) _(We recommend opening the quick link in another tab)_
 1. Add a job to your workflow as follows:
     ```yml
     Build-and-Push-Docker-Image:
