Merge main, resolve conflicts, fix content path references

Co-authored-by: GeekTrainer <6109729+GeekTrainer@users.noreply.github.com>

Author: Copilot

.gitignore

@@ -44,4 +44,7 @@ app/client/test-results/
 app/client/playwright-report/
 
 # e2e test database
-app/server/e2e_test_dogshelter.db
+app/server/e2e_test_dogshelter.db
+
+# azure
+.azure

README.md

@@ -1,6 +1,12 @@
 # Pets workshop
 
-This repository contains the project for two guided workshops to explore various GitHub features. The project is a website for a fictional dog shelter, with a [Flask](https://flask.palletsprojects.com/en/stable/) backend using [SQLAlchemy](https://www.sqlalchemy.org/) and an [Astro](https://astro.build/) frontend using [Tailwind CSS](https://tailwindcss.com/).
+This repository contains the project for three guided workshops to explore various GitHub features. The project is a website for a fictional dog shelter, with a [Flask](https://flask.palletsprojects.com/en/stable/) backend using [SQLAlchemy](https://www.sqlalchemy.org/) and an [Astro](https://astro.build/) frontend using [Tailwind CSS](https://tailwindcss.com/).
+
+The available workshops are:
+
+- **[One hour](./content/1-hour/README.md)** — focused on GitHub Copilot
+- **[Full-day](./content/full-day/README.md)** — a full day-in-the-life of a developer using GitHub for their DevOps processes
+- **[GitHub Actions](./content/github-actions/README.md)** — CI/CD pipelines from running tests to deploying to Azure
 
 ## Getting started
 

app/server/app.py

@@ -80,4 +80,4 @@ def get_dog(id: int) -> tuple[Response, int] | Response:
 ## HERE
 
 if __name__ == '__main__':
-    app.run(debug=True, port=5100) # Port 5100 to avoid macOS conflicts
+    app.run(debug=True, port=5100) # Port 5100 to avoid macOS conflicts

content/1-hour/0-setup.md

@@ -17,14 +17,14 @@ Let's create the repository you'll use for your workshop.
 1. Navigate to [the repository root](/)
 2. Select **Use this template** > **Create a new repository**
 
-    ![Screenshot of Use this template dropdown](images/0-setup-template.png)
+    ![Screenshot of Use this template dropdown](../shared-images/setup-use-template.png)
 
 3. Under **Owner**, select the name of your GitHub handle, or the owner specified by your workshop leader.
 4. Under **Repository**, set the name to **pets-workshop**, or the name specified by your workshop leader.
 5. Ensure **Public** is selected for the visibility, or the value indicated by your workshop leader.
 6. Select **Create repository from template**.
 
-    ![Screenshot of configured template creation dialog](images/0-setup-configure.png)
+    ![Screenshot of configured template creation dialog](../shared-images/setup-configure-repo.png)
 
 In a few moments a new repository will be created from the template for this workshop!
 
@@ -51,19 +51,19 @@ With the repository created, it's now time to clone the repository locally. We'l
     - macOS / Linux:
 
         ```sh
-        ./scripts/start-app.sh
+        ./app/scripts/start-app.sh
         ```
 
     - Windows (PowerShell):
 
         ```powershell
-        ./scripts/start-app.ps1
+        ./app/scripts/start-app.ps1
         ```
 
     If you encounter execution policy warnings on Windows, run PowerShell as an administrator or execute the script with an explicit bypass, for example:
 
     ```powershell
-    powershell -ExecutionPolicy Bypass -File .\scripts\start-app.ps1
+    powershell -ExecutionPolicy Bypass -File .\app\scripts\start-app.ps1
     ```
 
 The startup script will start two applications:

content/1-hour/1-add-endpoint.md

@@ -10,10 +10,10 @@ With code completions, GitHub Copilot provides suggestions in your code editor w
 
 It's standard to work in phases when adding functionality to an application. Given that we know we want to allow users to filter the list of dogs based on breed, we'll need to add an endpoint to provide a list of all breeds. Later we'll add the rest of the functionality, but let's focus on this part for now.
 
-The application uses a Flask app with SQLAlchemy as the backend API (in the [/server][server-code] folder), and an Astro app as the frontend (in the [/client][client-code] folder). You will explore more of the project later; this exercise will focus solely on the Flask application.
+The application uses a Flask app with SQLAlchemy as the backend API (in the [app/server][server-code] folder), and an Astro app as the frontend (in the [app/client][client-code] folder). You will explore more of the project later; this exercise will focus solely on the Flask application.
 
 > [!NOTE]
-> As you begin making changes to the application, there is always a chance a breaking change could be created. If the page stops working, check the terminal window you used previously to start the application for any error messages. You can stop the app by using <kbd>Ctl</kbd>+<kbd>C</kbd>, and restart it by running the script appropriate for your operating system: `./scripts/start-app.sh` (macOS / Linux) or `./scripts/start-app.ps1` (Windows PowerShell).
+> As you begin making changes to the application, there is always a chance a breaking change could be created. If the page stops working, check the terminal window you used previously to start the application for any error messages. You can stop the app by using <kbd>Ctl</kbd>+<kbd>C</kbd>, and restart it by running the script appropriate for your operating system: `./app/scripts/start-app.sh` (macOS / Linux) or `./app/scripts/start-app.ps1` (Windows PowerShell).
 
 ## Flask routes
 

content/README.md

@@ -1,11 +1,12 @@
 # Pets workshop
 
-This repository contains two workshops:
+This repository contains three workshops:
 
 - a [one hour](./1-hour/README.md) workshop focused on GitHub Copilot.
 - a [full-day](./full-day/README.md) workshop which covers a full day-in-the-life of a developer using GitHub for their DevOps processes.
+- a [GitHub Actions](./github-actions/README.md) workshop covering CI/CD pipelines from running tests to deploying to Azure.
 
-Both workshops are built around a fictional dog shelter, where you are a volunteer helping them build out their website.
+All workshops are built around a fictional dog shelter, where you are a volunteer helping them build out their website.
 
 ## Get started
 

content/full-day/0-setup.md

@@ -12,12 +12,12 @@ Let's create the repository you'll use for your workshop.
 
 1. Navigate to [the repository root][repo-root]
 2. Select **Use this template** > **Create a new repository**
-    ![Screenshot of Use this template dropdown](../1-hour/images/0-setup-template.png)
+    ![Screenshot of Use this template dropdown](../shared-images/setup-use-template.png)
 3. Under **Owner**, select the name of your GitHub handle, or the owner specified by your workshop leader.
 4. Under **Repository**, set the name to **pets-workshop**, or the name specified by your workshop leader.
 5. Ensure **Public** is selected for the visibility, or the value indicated by your workshop leader.
 6. Select **Create repository from template**.
-    ![Screenshot of configured template creation dialog](../1-hour/images/0-setup-configure.png)
+    ![Screenshot of configured template creation dialog](../shared-images/setup-configure-repo.png)
 
 In a few moments a new repository will be created from the template for this workshop!
 

content/full-day/3-codespaces.md

@@ -92,7 +92,7 @@ Before rebuilding the container, let's add **GitHub.copilot** to the list of ext
 6. Just below the list of ports, add the command to run the startup script to the container definition:
 
     ```json
-    "postStartCommand": "chmod +x /workspaces/pets-workshop/scripts/start-app.sh && /workspaces/pets-workshop/scripts/start-app.sh",
+    "postStartCommand": "chmod +x /workspaces/pets-workshop/app/scripts/start-app.sh && /workspaces/pets-workshop/app/scripts/start-app.sh",
     ```
 
 You've now defined a custom container!

content/full-day/README.md

@@ -15,7 +15,7 @@ This workshop is built to help guide you through some of the most common DevOps
 
 ## Prerequisites
 
-The application for the workshop uses is built primarily with Python (Flask and SQLAlchemy) and Astro (using Tailwind). While experience with these frameworks and languages is helpful, you'll be using Copilot to help you understand the project and generate the code. As a result, as long as you are familiar with programming you'll be able to complete the exercises!
+The application used for the workshop is built primarily with Python (Flask and SQLAlchemy) and Astro (using Tailwind). While experience with these frameworks and languages is helpful, you'll be using Copilot to help you understand the project and generate the code. As a result, as long as you are familiar with programming you'll be able to complete the exercises!
 
 ## Required resources
 

content/github-actions/0-setup.md

@@ -0,0 +1,51 @@
+# Workshop Setup
+
+| [← GitHub Actions: From CI to CD][walkthrough-previous] | [Next: Introduction & Your First Workflow →][walkthrough-next] |
+|:-----------------------------------|------------------------------------------:|
+
+To complete this workshop you will need to create a repository with a copy of the contents of this repository. While this can be done by [forking a repository][fork-repo], the goal of a fork is to eventually merge code back into the original (or upstream) source. In our case we want a separate copy as we don't intend to merge our changes. This is accomplished through the use of a [template repository][template-repo]. Template repositories are a great way to provide starters for your organization, ensuring consistency across projects.
+
+The repository for this workshop is configured as a template, so we can use it to create your repository.
+
+## Create your repository
+
+Let's create the repository you'll use for your workshop.
+
+1. Navigate to [the repository root][repo-root]
+2. Select **Use this template** > **Create a new repository**
+
+    ![Screenshot of Use this template dropdown](../shared-images/setup-use-template.png)
+
+3. Under **Owner**, select the name of your GitHub handle, or the owner specified by your workshop leader.
+4. Under **Repository**, set the name to **pets-workshop**, or the name specified by your workshop leader.
+5. Ensure **Public** is selected for the visibility, or the value indicated by your workshop leader.
+6. Select **Create repository from template**.
+
+    ![Screenshot of configured template creation dialog](../shared-images/setup-configure-repo.png)
+
+In a few moments a new repository will be created from the template for this workshop!
+
+## Open your codespace
+
+Now let's open a codespace so you have a development environment ready to go.
+
+1. Navigate to the main page of your newly created repository.
+2. Select **Code** > **Codespaces** > **Create codespace on main**.
+
+    In a few moments a codespace will open in your browser with a full VS Code editor. This is where you'll create and edit files throughout the workshop.
+
+> [!TIP]
+> If your codespace ever disconnects or you close the tab, you can reopen it by navigating to your repository and selecting **Code** > **Codespaces** and the name of your codespace.
+
+## Summary and next steps
+
+You've created the repository and opened a codespace — you're ready to start building! Next let's [create your first workflow][walkthrough-next].
+
+| [← GitHub Actions: From CI to CD][walkthrough-previous] | [Next: Introduction & Your First Workflow →][walkthrough-next] |
+|:-----------------------------------|------------------------------------------:|
+
+[fork-repo]: https://docs.github.com/get-started/quickstart/fork-a-repo
+[template-repo]: https://docs.github.com/repositories/creating-and-managing-repositories/creating-a-template-repository
+[repo-root]: /
+[walkthrough-previous]: README.md
+[walkthrough-next]: 1-introduction.md