From 5d5e58e704eed4a9910d75210eac12f11b4f1511 Mon Sep 17 00:00:00 2001 From: Michael Lorant Date: Thu, 4 Jan 2024 13:30:42 +1100 Subject: [PATCH] Add prepare the commit demo videos Add demo videos for prepare the commit section. These videos demonstrate how to squash commits and update the commit message. --- pages/prepare-the-commit.md | 18 ++++++ public/videos/prepare-the-commit-squash.webm | 3 + .../prepare-the-commit-update-message.webm | 3 + .../tapes/prepare-the-commit-squash.tape | 36 ++++++++++++ .../prepare-the-commit-update-message.tape | 56 +++++++++++++++++++ .../sources/git-commit-chore-update.tape | 26 +++++++++ .../video/tapes/sources/git-commit-chore.tape | 25 +++++++++ 7 files changed, 167 insertions(+) create mode 100644 public/videos/prepare-the-commit-squash.webm create mode 100644 public/videos/prepare-the-commit-update-message.webm create mode 100644 scripts/video/tapes/prepare-the-commit-squash.tape create mode 100644 scripts/video/tapes/prepare-the-commit-update-message.tape create mode 100644 scripts/video/tapes/sources/git-commit-chore-update.tape create mode 100644 scripts/video/tapes/sources/git-commit-chore.tape diff --git a/pages/prepare-the-commit.md b/pages/prepare-the-commit.md index 9b5668c..8fcae7e 100644 --- a/pages/prepare-the-commit.md +++ b/pages/prepare-the-commit.md @@ -52,6 +52,15 @@ pick 2 feature1_fix +--- +layout: full +preload: false +--- + + + --- layout: center --- @@ -114,6 +123,15 @@ Part of JIRA-123 +--- +layout: full +preload: false +--- + + + --- hideInToc: true --- diff --git a/public/videos/prepare-the-commit-squash.webm b/public/videos/prepare-the-commit-squash.webm new file mode 100644 index 0000000..d7de892 --- /dev/null +++ b/public/videos/prepare-the-commit-squash.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:96c430133d22e1deb87873200b8bf3bb7c09d97a03a2b8f63b4dd8a31bf468f9 +size 301029 diff --git a/public/videos/prepare-the-commit-update-message.webm b/public/videos/prepare-the-commit-update-message.webm new file mode 100644 index 0000000..b58dc82 --- /dev/null +++ b/public/videos/prepare-the-commit-update-message.webm @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ace82cc6a77a02640dca19383fd45102def1037d268d9de54a076a50f2915978 +size 785719 diff --git a/scripts/video/tapes/prepare-the-commit-squash.tape b/scripts/video/tapes/prepare-the-commit-squash.tape new file mode 100644 index 0000000..640e4de --- /dev/null +++ b/scripts/video/tapes/prepare-the-commit-squash.tape @@ -0,0 +1,36 @@ +Output ../../public/videos/prepare-the-commit-squash.webm + +Set Width 1050 +Set Height 700 + +Source tapes/sources/init.tape + +Type "git reset --hard HEAD~" Enter Sleep 0.25 + +Source tapes/sources/git-commit-feature1.tape +Source tapes/sources/git-commit-feature1-improve.tape + +Type "git commit" Sleep 1 Enter +Type "i" Sleep 0.25 +Type "Improve feature1" Sleep 1 +Escape +Type "ZZ" Sleep 3 + +Ctrl+L Sleep 0.25 + +Show Sleep 1 + +Type "git fetch origin main:main" Sleep 1 Enter Sleep 3 + +Type "git rebase -i main" Sleep 1 Enter Sleep 3 +Down Sleep 1 +Type "cw" Sleep 1 +Type "f" Sleep 3 +Escape +Type "ZZ" Sleep 3 + +Ctrl+L Sleep 0.25 + +Type "git show -p main.." Sleep 1 Enter Sleep 3 + +Source tapes/sources/terminate.tape diff --git a/scripts/video/tapes/prepare-the-commit-update-message.tape b/scripts/video/tapes/prepare-the-commit-update-message.tape new file mode 100644 index 0000000..654af9b --- /dev/null +++ b/scripts/video/tapes/prepare-the-commit-update-message.tape @@ -0,0 +1,56 @@ +Output ../../public/videos/prepare-the-commit-update-message.webm + +Set Width 1050 +Set Height 700 + +Source tapes/sources/init.tape +Source tapes/sources/git-commit-chore.tape + +Type "git switch -c chore/update-deps" Enter Sleep 0.25 + +Source tapes/sources/git-commit-chore-update.tape + +Ctrl+L + +Show Sleep 1 + +Type "git show -p main.." Sleep 1 Enter Sleep 3 + +Ctrl+L Sleep 0.25 + +Type "git commit --amend" Sleep 1 Enter Sleep 1 +Type ":g!/^#/d" Sleep 1 Enter Sleep 1 +Type "O" Sleep 1 + +Set TypingSpeed 25ms + +Type "Update dependencies to latest stable versions" Enter +Enter +Type "Upgraded third-party libraries to their latest stable releases to" +Type " incorporate security patches, bug fixes, and performance improvements." +Type " This routine maintenance helps keep the codebase secure and efficient." Enter +Enter +Type "- Updated package.json with the latest library versions" Enter +Type "- Adjusted code where breaking changes were introduced" Enter +Type "- Ran the full test suite to ensure compatibility with updates" Enter +Enter +Type "These changes are a proactive measure to mitigate potential security" +Type " vulnerabilities and maintain the reliability of our application in light" +Type " of new software updates." Enter +Enter +Type "Part of JIRA-123" + +Set TypingSpeed 50ms + +Sleep 3 + +Escape +Type "ZZ" Sleep 3 + +Ctrl+L Sleep 0.25 + +Type "git show -p main.." Sleep 1 Enter Sleep 5 +Type " " Sleep 1 +Type "q" Sleep 1 + +Source tapes/sources/terminate.tape diff --git a/scripts/video/tapes/sources/git-commit-chore-update.tape b/scripts/video/tapes/sources/git-commit-chore-update.tape new file mode 100644 index 0000000..8c91d1c --- /dev/null +++ b/scripts/video/tapes/sources/git-commit-chore-update.tape @@ -0,0 +1,26 @@ +Type "vim package.json" Enter Sleep 1 + +Type "5G" +Type "1f1" +Type "r2" + +Down +Type "1f0" +Type "r1" +Right 2 +Type "r0" + +Type "3G" +Type "2f0" +Type "r1" + +Type "ZZ" Sleep 1 + +Type "git add -p" Enter Sleep 1 +Type "y" Sleep 1 Enter Sleep 1 + +Type "git commit" Sleep 1 Enter +Type "i" Sleep 0.25 +Type "Update dependencies" Sleep 1 +Escape +Type "ZZ" Sleep 3 diff --git a/scripts/video/tapes/sources/git-commit-chore.tape b/scripts/video/tapes/sources/git-commit-chore.tape new file mode 100644 index 0000000..f01fa89 --- /dev/null +++ b/scripts/video/tapes/sources/git-commit-chore.tape @@ -0,0 +1,25 @@ +Type "vim package.json" Enter Sleep 1 + +Type "i" +Type `{` Enter +Type `"name": "app",` Enter +Type `"version": "1.0.0",` Enter +Type `"dependencies": {` Enter +Type `"my_dep": "2.1.0",` Enter +Type `"another_dep": "5.0.2",` Enter +Type `}` Enter +Type `}` +Escape + +Type "ZZ" Sleep 1 + +Type "git add -N package.json" Enter Sleep 1 + +Type "git add -p" Enter Sleep 1 +Type "y" Sleep 1 Enter Sleep 1 + +Type "git commit" Sleep 1 Enter +Type "i" Sleep 0.25 +Type "Add dependencies" Sleep 1 +Escape +Type "ZZ" Sleep 3