From 7a27de91113a79ac47692a631f2098eb31b42d2d Mon Sep 17 00:00:00 2001 From: jcook3701 Date: Mon, 26 Jan 2026 12:38:12 -0800 Subject: [PATCH 1/3] fix(makefile): emoji for documentation fixed. --- changelogs/CHANGELOG.md | 36 ++++++++++++++---------- changelogs/releases/v0.1.1.md | 36 ++++++++++++++---------- {{ cookiecutter.project_slug }}/Makefile | 4 +-- 3 files changed, 44 insertions(+), 32 deletions(-) diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index c328d22..04298c4 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -99,25 +99,31 @@ Feat 010 (#33) - Merge pull request #36 from jcook3701/develop Feat 011 cla fix (#35) -- Update template -- Update template -- Update template -- Update template -- Update template -- Merge branch 'cookiecutter-template' into feat-012 -- Update template -- Merge branch 'cookiecutter-template' into feat-012 +- Feat 012 (#37) -### 🐛 Fixed +* feat(build): Updates to documentation makefile. -- *(template)* Updates to template cookiecutter.json file. -- *(cla)* Fix for CLA fix for master branch. -- *(makefile)* Minor fix for documentation emoji. +* fix(cla): Fix for CLA fix for master branch. +- Merge pull request #38 from jcook3701/develop + +Feat 012 (#37) +- Creating file for storing CLA Signatures +- Feat 012 (#39) + +* feat(build): Updates to documentation makefile. + +* fix(cla): Fix for CLA fix for master branch. -### 🚀 Added +* chore(template) Update template from cookiecutter-cookiecutter repository. -- *(build)* Updates to documentation makefile. -- *(build)* Updates to documentation makefile. +* fix(makefile): Minor fix for documentation emoji. +- Merge pull request #40 from jcook3701/develop + +Feat 012 (#39) + +### 🐛 Fixed + +- *(template)* Updates to template cookiecutter.json file. ## [0.1.0] - 2025-12-05 ### ⚙️ Miscellaneous diff --git a/changelogs/releases/v0.1.1.md b/changelogs/releases/v0.1.1.md index 4ba65c6..8bf787e 100644 --- a/changelogs/releases/v0.1.1.md +++ b/changelogs/releases/v0.1.1.md @@ -99,22 +99,28 @@ Feat 010 (#33) - Merge pull request #36 from jcook3701/develop Feat 011 cla fix (#35) -- Update template -- Update template -- Update template -- Update template -- Update template -- Merge branch 'cookiecutter-template' into feat-012 -- Update template -- Merge branch 'cookiecutter-template' into feat-012 +- Feat 012 (#37) -### 🐛 Fixed +* feat(build): Updates to documentation makefile. -- *(template)* Updates to template cookiecutter.json file. -- *(cla)* Fix for CLA fix for master branch. -- *(makefile)* Minor fix for documentation emoji. +* fix(cla): Fix for CLA fix for master branch. +- Merge pull request #38 from jcook3701/develop + +Feat 012 (#37) +- Creating file for storing CLA Signatures +- Feat 012 (#39) + +* feat(build): Updates to documentation makefile. + +* fix(cla): Fix for CLA fix for master branch. -### 🚀 Added +* chore(template) Update template from cookiecutter-cookiecutter repository. -- *(build)* Updates to documentation makefile. -- *(build)* Updates to documentation makefile. +* fix(makefile): Minor fix for documentation emoji. +- Merge pull request #40 from jcook3701/develop + +Feat 012 (#39) + +### 🐛 Fixed + +- *(template)* Updates to template cookiecutter.json file. diff --git a/{{ cookiecutter.project_slug }}/Makefile b/{{ cookiecutter.project_slug }}/Makefile index 3c9ecd3..03d4e73 100644 --- a/{{ cookiecutter.project_slug }}/Makefile +++ b/{{ cookiecutter.project_slug }}/Makefile @@ -39,7 +39,7 @@ AUTHOR = "{{ cookiecutter.author }}" VERSION = "{{ cookiecutter.version }}" PUBLISHDIR ?= # -------------------------------------------------- -# 📘 Documentation (Sphinx + Jekyll) +# 📚 Documentation (Sphinx + Jekyll) # -------------------------------------------------- RUBY_INSTALL := bundle install JEKYLL_BUILD := bundle exec jekyll build --quiet @@ -60,7 +60,7 @@ ruby-install: # 📚 Documentation (Jekyll) # -------------------------------------------------- jekyll: - $(AT)echo "🔨 Building Jekyll site 📘..." + $(AT)echo "🔨 Building Jekyll site 📚..." $(AT)$(JEKYLL_BUILD) $(AT)echo "✅ Full documentation build complete!" From 78dd02a4043a991fdb7ef2d50e4157d878dcb8f6 Mon Sep 17 00:00:00 2001 From: jcook3701 Date: Mon, 26 Jan 2026 12:45:20 -0800 Subject: [PATCH 2/3] fix(ci/cd): Jekyll build and deploy fix. --- .github/workflows/jekyll-gh-pages.yml | 5 +---- changelogs/CHANGELOG.md | 1 + changelogs/releases/v0.1.1.md | 1 + {{ cookiecutter.project_slug }}/Makefile | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/jekyll-gh-pages.yml b/.github/workflows/jekyll-gh-pages.yml index b6c5357..eeeab84 100644 --- a/.github/workflows/jekyll-gh-pages.yml +++ b/.github/workflows/jekyll-gh-pages.yml @@ -60,13 +60,10 @@ jobs: ruby-version: '3.3' # Recommended for Jekyll 4.4 in 2026 bundler-cache: true # Runs 'bundle install' and caches gems automatically working-directory: ./docs/jekyll - - name: Install Ruby Packages - run: | - make ruby-install - name: Setup Pages uses: actions/configure-pages@v5 - name: Build with Jekyll site in /docs/jekyll - run: make build-docs + run: make jekyll env: PAGES_REPO_NWO: ${{ github.repository }} JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index 04298c4..f41047b 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -124,6 +124,7 @@ Feat 012 (#39) ### 🐛 Fixed - *(template)* Updates to template cookiecutter.json file. +- *(makefile)* Emoji for documentation fixed. ## [0.1.0] - 2025-12-05 ### ⚙️ Miscellaneous diff --git a/changelogs/releases/v0.1.1.md b/changelogs/releases/v0.1.1.md index 8bf787e..489b28b 100644 --- a/changelogs/releases/v0.1.1.md +++ b/changelogs/releases/v0.1.1.md @@ -124,3 +124,4 @@ Feat 012 (#39) ### 🐛 Fixed - *(template)* Updates to template cookiecutter.json file. +- *(makefile)* Emoji for documentation fixed. diff --git a/{{ cookiecutter.project_slug }}/Makefile b/{{ cookiecutter.project_slug }}/Makefile index 03d4e73..fd65da4 100644 --- a/{{ cookiecutter.project_slug }}/Makefile +++ b/{{ cookiecutter.project_slug }}/Makefile @@ -50,7 +50,7 @@ JEKYLL_SERVE := bundle exec jekyll serve # -------------------------------------------------- # Default: # -------------------------------------------------- -all: build +all: ruby-install build # -------------------------------------------------- # ♦️ Ruby # -------------------------------------------------- From 2545fa3bcd85dafda103bba61d2145ad55367426 Mon Sep 17 00:00:00 2001 From: jcook3701 Date: Mon, 26 Jan 2026 12:48:55 -0800 Subject: [PATCH 3/3] fix(cla): Forgot to add '$' to github.repo in cla ci/cd. --- .github/workflows/cla.yml | 2 +- changelogs/CHANGELOG.md | 1 + changelogs/releases/v0.1.1.md | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index dff28e2..9b3bc45 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -50,7 +50,7 @@ jobs: with: signed-commit-message: 'chore: $contributorName has signed the CLA' path-to-signatures: 'signatures/version1/cla.json' - path-to-document: 'https://github.com/{{ github.repository }}/blob/master/docs/jekyll/_site/manual/developer-resources/cla.html' # e.g. a CLA or a DCO document + path-to-document: 'https://github.com/${{ github.repository }}/blob/master/docs/jekyll/_site/manual/developer-resources/cla.html' # e.g. a CLA or a DCO document # branch should not be protected branch: 'master' allowlist: "{{ cookiecutter.github_username }},github-actions[bot],dependabot[bot],bot*" diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index f41047b..9474291 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -125,6 +125,7 @@ Feat 012 (#39) - *(template)* Updates to template cookiecutter.json file. - *(makefile)* Emoji for documentation fixed. +- *(ci/cd)* Jekyll build and deploy fix. ## [0.1.0] - 2025-12-05 ### ⚙️ Miscellaneous diff --git a/changelogs/releases/v0.1.1.md b/changelogs/releases/v0.1.1.md index 489b28b..5a49b0a 100644 --- a/changelogs/releases/v0.1.1.md +++ b/changelogs/releases/v0.1.1.md @@ -125,3 +125,4 @@ Feat 012 (#39) - *(template)* Updates to template cookiecutter.json file. - *(makefile)* Emoji for documentation fixed. +- *(ci/cd)* Jekyll build and deploy fix.