Skip to content

Commit

Permalink
Add notes and instructions to slides
Browse files Browse the repository at this point in the history
Add notes to share the exercise slides
Prompt to pull down change to .travis.yml
Add note about confirming Travis account in email

Part of #36
  • Loading branch information
mrmanc committed Jan 27, 2022
1 parent a4300db commit b50db99
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 10 deletions.
19 changes: 13 additions & 6 deletions docs/_posts/0000-02-04-ci-exercise.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,20 @@
* Java folk: open IntelliJ IDEA and from the `File` menu choose `Open`, then select the `build.gradle` file from the `exercises\java` directory.

Note: explain difference between forking and using a template.
Share the exercise slide!

--

## Exercise Part 1: Set up Travis CI

* Work in pairs
* Log into https://travis-ci.com
* You must confirm your Travis account in your email
* Check that you can see your repository in the list
* Activate Travis CI for your fork

Note: Make sure you have the right Travis CI
travis-ci.com is the paid for enterprise version
Note:
Share the exercise slide!

--

Expand Down Expand Up @@ -67,15 +69,19 @@ script:
<!-- .element: style="font-size: 35%" -->
Note: Remind them about the dot at the front of the filename!
Share the exercise slide!
--
## Exercise Part 3: Make it fail
* Find the tests which aren't running (the ones for petrol vehicles)
* Make the tests run (and fail)
* Push your change
* Watch it fail
* Pull down the changes (`.travis.yml`) you just made on GitHub
* Find the tests which aren't running (the ones for petrol vehicles)
* Make the tests run (and fail)
* Push your change
* Watch it fail

Note: Need to pull before you can push.

--

Expand All @@ -90,6 +96,7 @@ Note: Remind them about the dot at the front of the filename!
**\*N.B. you'll need to set the year to `2019` in your `TaxCalculator` object**

Note: Did you get an email telling you it had failed?
Share the exercise slide!

--

Expand Down
9 changes: 6 additions & 3 deletions docs/_posts/0000-04-02-branching-exercise.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
```
* Check tracking branches again
Note: do this one together, as a group
Note: do this one together, as a group
Share the exercise slide!
--
Expand All @@ -32,7 +33,8 @@ Note: do this one together, as a group
* Choose ‘Manage Access’
* Add your partner
Note: split off into rooms
Note: split off into rooms
Share the exercise slide!
--
Expand Down Expand Up @@ -62,7 +64,8 @@ Notes:
See branch ```petrol_tax``` for a starting point to this exercise if they haven't completed the previous one.
N.B. don't get them to checkout the branch (git weirdness will ensue), just get them to copy-paste the working code.
There are already test suites for these stories they just need to be enabled so the build runs them.
When pushing they will need to run `git push --set-upstream origin story_2` etc
When pushing they will need to run `git push --set-upstream origin story_2` etc
Share the exercise slide!
--
Expand Down
3 changes: 3 additions & 0 deletions docs/_posts/0000-05-02-fixing-mistakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,7 @@ git reset --soft HEAD~1
git reset --mixed HEAD~1
git reset --hard HEAD~1
```
Share the exercise slide!

--

Expand All @@ -244,6 +245,7 @@ git add .
git commit --amend --no-edit
git commit --amend --m "new message"
```
Share the exercise slide!

--

Expand Down Expand Up @@ -275,3 +277,4 @@ git add mirrorfile
git commit -m "Add mirrorfile"
git log --oneline --graph --all
```
Share the exercise slide!
1 change: 1 addition & 0 deletions docs/_posts/0000-06-02-trunk-exercise.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* Turn the new features on one at a time

Notes:
Share the exercise slide!
See branch ```diesel_and_alternative_tax``` for a starting point to this exercise if they haven't completed the previous one.
N.B. don't get them to checkout the branch (git weirdness will ensue), just get them to copy-paste the working code.
There are already test suites for these stories they just need to be enabled so the build runs them.
Expand Down
3 changes: 3 additions & 0 deletions docs/_posts/0000-08-01-cautionary-tale.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ Bankrupt!
* Discuss what happened
* Note down 3–4 lessons that should be learned

Note:
Share the exercise slide!

--

## What should we learn?
Expand Down
4 changes: 3 additions & 1 deletion docs/_posts/0000-10-03-fixing-more-mistakes.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ git log --oneline
git revert [credentials-commit-hash]
git log --oneline (show result)
```
Share the exercise slide!

--

Expand Down Expand Up @@ -169,4 +170,5 @@ git stash list
git stash apply --index
git stash drop
git stash list
```
```
Share the exercise slide!

0 comments on commit b50db99

Please sign in to comment.