search

joshjohanning / joshjohanning.github.io

josh-ops.com | a devops blog
https://josh-ops.com
MIT License
8 stars 0 forks source link
azure azure-devops devops github github-actions pipelines

readme

josh-ops.com

Overview

A DevOps Blog - Blogging about GitHub and Azure DevOps practices, tips, scripts, and my continuous improvement DevOps journey.

josh-ops.com →

Build and Deploy

Theme Source

Chirpy:

Comment System

Deviations from Chirpy

Adding Speaking tab

Light Mode Sidebar Background Color

Changelog

Preview Images

Changelog

Upgrading the Theme

Since we aren't using the theme gem (so we can do customizations), we have to do it the old-fashioned way:

  1. Ensure chirpy is set as a remote: git remote add chirpy https://github.com/cotes2020/jekyll-theme-chirpy.git
  2. Ensure you have the latest upstream commit: git fetch chirpy
  3. Compare the upstream releases and commits to find the first and last release/commit in the range you want to update
    • Recommendation is to use release tag milestones instead of loose commits that aren't part of a release yet
    • You can use this link to compare the changes between two commits in GitHub (same for releases)
  4. Start the git cherry-pick:
    • To cherry-pick between a range of release tags (more common): git cherry-pick "v5.6.0..v5.6.1" -m 1
    • To cherry-pick a single commit (not as common): git cherry-pick a887f1d -m 1
    • If getting GPG errors, modify the local git config: git config commit.gpgsign false, but modify it back to true after you are done cherry-picking and rebasing (before amending commit)
  5. Review merge conflicts - use a combination of git cherry-pick --skip (for when readme/starter posts are updated) and cherry-pick --continue (to continue after you resolve real merge conflicts)
  6. Starting in Chirpy v5.6.0, run: npm run build && git add assets/js/dist _sass/dist -f && git commit -m "update js assets" (docs)
    • You can also run a command that's referenced in the init.sh to remove this from .gitignore: sed -i '' "/.*\/dist$/d" .gitignore
  7. Rebase the number of commits you just brought in (you should see icon in VS Code): git rebase -i HEAD~16
    • Leave the top commit as pick but change the rest to squash
    • Update the commit message as appropriate
  8. Pay close attention to the terminal output as to which new files are being created and if they should be deleted (new files show up as create mode 100644 file.ext)
    • For example, we wouldn't want to commit a GitHub workflow or issue template that wasn't needed here
    • If there are new files that we don't want to track, delete the files, commit, and run another rebase git rebase -i HEAD~2
    • This command can help with tracking new files in the most recent commit: git diff-tree --compact-summary -r HEAD --diff-filter=A
  9. Ensure commit signing is enabled: git config commit.gpgsign true
  10. Update author and commit time: git commit --amend --author "Josh Johanning <joshjohanning@github.com>" --date=now -S
  11. Test changes locally before pushing

Building / Testing Locally

bundle install
npm i && npm run build
bundle exec jekyll s

Additional build notes

On macOS

Check ruby version: ruby -v (if ruby 2.6.10p210, then you need to upgrade to 3.0.0+):

  1. Install Ruby via Homebrew: brew install ruby (can also use rvm)
  2. Make sure the new Ruby is in your path: export PATH="/opt/homebrew/opt/ruby/bin:$PATH"' >> ~/.zshrc
  3. Check ruby version: ruby -v (should be 3.0.0+)
  4. Build and serve the site as normal

On Codespaces

If seeing a racc 1.6.2 permission error, run:

sudo chown -R codespace /usr/local/rvm/gems/ruby-3.1.4/extensions/x86_64-linux/3.1.0
bundle install