Merge branch 'master' into patch-1

Author: hectorsector

config.yml

@@ -1,6 +1,5 @@
 # Course information
 title: "GitHub Actions: Continuous Delivery"
-tagline: Use GitHub Actions to deploy a serverless application to the cloud
 description: Create two deployment workflows using AWS.
 tags:
   - GitHub Actions

course-details.md

@@ -1,11 +1,44 @@
-This course is about continuous delivery, or CD, with GitHub Actions. We create two workflows to deploy our app to an AWS S3 bucket automatically. CD is an important part of modern software development, and it has a big meaning. CD is the practice of delivering software faster and with higher quality. To do this, it takes many different practices, behaviors, and technologies. 
+This course is about continuous delivery, or CD, with GitHub Actions. CD is a crucial part of modern software development, and it can have a monumental impact on development projects. 
 
-In this course, we focus on workflows to deploy pull requests automatically to a staging environment, and to deploy all merged commits to production. In this course, you will:
+Continuous Delivery is the practice of delivering software faster and with higher quality. Doing so successfully requires many different practices, behaviors, and technologies. GitHub Actions makes implementing CD easier, faster, and more reliable.
 
-- Create two workflow files
-- Configure AWS S3 for deployment
+In this course, we focus on using workflows in GitHub Actions to deploy pull requests automatically to a staging environment, and to deploy all merged commits to production.
+
+**Please note**: You may need a credit card to create an account with a cloud provider. If you're a student, you may also be able to take advantage of the [Student Developer Pack](https://education.github.com/pack) for access to a cloud provider. If you'd like to continue with the course without an account with a cloud provider, Learning Lab will still respond, but none of the deployments will work.
+
+## What you'll learn
+
+We'll answer common questions like:
+- What is Continuous Delivery?
+- What is a workflow file and how are workflows used with GitHub Actions?
+- What are deployment triggers and how are they used with deployments?
+- How can secrets store tokens?
+
+
+And when you're done you'll be able to:
+- Use GitHub Actions and create workflow files
 - Use secrets to store tokens
-- Deploy to staging and production
-- Practice using GitHub Actions
+- Deploy to staging and production using GitHub Actions to implement CD
+
+
+## What you'll build
+In this course, we'll be walking through a CD deployment using GitHub Actions, and creating a Tic Tac Toe game!
+
+![deployed app](https://user-images.githubusercontent.com/16547949/75822607-4003d480-5d6e-11ea-99e5-fc0cb5ca8054.gif)
+
+## Prerequisites
+Before you start, you should be familiar with GitHub and Continuous Integration. We recommend taking the following three Learning Labs prior to this course:
+
+- [Introduction to GitHub](https://lab.github.com/githubtraining/introduction-to-github)
+- [Hello GitHub Actions!](https://lab.github.com/github/hello-github-actions!)
+- [Continuous Integration with GitHub Actions](https://lab.github.com/githubtraining/set-up-continuous-integration-with-github-actions)
+
+## Projects used
+This course makes use of the following technologies:
+- [Node.js](https://nodejs.org/en/download/)
+- AWS - [create an account](https://portal.aws.amazon.com/billing/signup) if you don't already have one.
+- [Amazon S3](https://s3.console.aws.amazon.com/s3/home) Buckets
+
+## Audience
 
-**Please note**: You may need a credit card to create an AWS account. If you're a student, you may also be able to take advantage of the [Student Developer Pack](https://education.github.com/pack) for access to AWS. If you'd like to continue with the course without an AWS account, Learning Lab will still respond, but none of the deployments will work.
+Developers, DevOps Engineers, students, teams

responses/01_label-trigger.md

@@ -25,7 +25,7 @@ Every deployment is kicked off by some trigger. Engineers at many companies, lik
 
 In a GitHub Actions workflow, the `on` step defines what causes the workflow to run. In this case, we want the workflow to run whenever a label is applied to the pull request.
 
-### :keyboard: Activity: Configure the workflow trigger based on an a label being added
+### :keyboard: Activity: Configure the workflow trigger based on a label being added
 
 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`

responses/03_workflow-steps.md

@@ -11,7 +11,7 @@ We won't be going into detail on the steps of this workflow, but it would be a g
 - [`actions/download-artifact`](https://github.com/actions/download-artifact)
 - [`github/deploy-nodejs`](https://github.com/github/deploy-nodejs)
 
-The course [_Using GitHub Actions for CI_](https://lab.github.com/githubtraining/using-github-actions-for-ci) also teaches how to use most of these actions in details.
+The course [_Using GitHub Actions for CI_](https://lab.github.com/githubtraining/github-actions:-continuous-integration) also teaches how to use most of these actions in details.
 
 ### :keyboard: Activity: Deploy a Node.js app to AWS for the first time
 

responses/07_approve.md

@@ -16,10 +16,10 @@ This file is specific to deploying a serverless application to AWS. Specifically
 
 In our case, we created the `sam-template.yml` for you. It contains information that's specific about the application's endpoints and structure.
 
-## Step 7: Approve the pull request
+## Step 6: Approve the pull request
 
 I've requested your approval on this pull request. Once you approve this, I will merge.
 
 ### :keyboard: Activity: Approve pull request adding `aws-config.yml` and `sam-template.yml`
 
-1. Approve this pull request
+1. Approve this pull request

responses/08_test.md

@@ -2,11 +2,11 @@
 
 Now that the proper configuration and workflow files are present, let's test this action out!
 
-## Step 8: Test the staging action
+## Step 7: Test the staging action
 
 In this pull request, there's a small change to the game. Once you add the label, you should be able to see the deployment!
 
 ### :keyboard: Activity: Add the proper label to this pull request
 
-1. On the right hand side, click **Add label**
+1. On the right hand side, click **Labels** or the gear next to it
 2. Select the label titled **stage**

responses/09_merge-trigger.md

@@ -4,7 +4,7 @@ Deployments to production can be manual (like through a Chat Ops command), or au
 
 We'll trigger a deployment to the production environment whenever something is committed to master. Our master branch is protected, so the only way for commits to appear on master is for a pull request to have been created and gone through the proper review process and merged.
 
-## Step 9: Write the production deployment trigger
+## Step 8: Write the production deployment trigger
 
 Let's create a new workflow that deals specifically with commits to master and handles deployments to prod.
 
@@ -26,4 +26,4 @@ on:
   push:
     branches:
       - master
-```
+```

responses/10_deploy-prod.md

@@ -8,7 +8,7 @@ Just like with the other workflow, we'll need to build our application and deplo
 
 In our case, we can match our production environment to be exactly like our staging environment. This minimizes opportunities for surprises once we deploy to production.
 
-## Step 10: Complete the deployment to production workflow
+## Step 9: Complete the deployment to production workflow
 
 ### :keyboard: Commit the steps to the production workflow that allow you to deploy on merge to master
 
@@ -59,4 +59,4 @@ jobs:
         env:
           AWS_ACCESS_KEY: {% raw %}${{ secrets.AWS_ACCESS_KEY }}{% endraw %}
           AWS_SECRET_KEY: {% raw %}${{ secrets.AWS_SECRET_KEY }}{% endraw %}
-```
+```

responses/11_workflow-steps.md

@@ -7,7 +7,7 @@ We'll only use one new action here created by a GitHubber, which allows us to pu
 
 All of this happens automatically once a pull request is merged!
 
-## Step 11: Write the steps for the production workflow
+## Step 10: Create the Docker image and push it to GitHub Packages
 
 ### :keyboard: Activity: Write the steps for the production deployment workflow
 
@@ -100,4 +100,4 @@ jobs:
         with:
           repo-token: {% raw %}${{ secrets.GITHUB_TOKEN }}{% endraw %}
           image-name: tic-tac-toe
-```
+```

responses/12_merge.md

@@ -2,9 +2,9 @@
 
 Nice job, you've done it!
 
-## Step 12: Merge the production workflow
+## Step 11: Merge the production workflow
 
 ### :keyboard: Activity: Merge this pull request and test the production deployment workflow
 
 1. Merge this pull request
-2. Delete the branch
+2. Delete the branch