From 76c0ba4ada694e712033ce5baa089b3f38b9f05e Mon Sep 17 00:00:00 2001 From: Cedric Date: Tue, 30 Jan 2024 21:55:07 +0000 Subject: [PATCH 1/7] Update supporters file As per the printed book. Mostly done as an exercise to see how hard it was to copy paste. --- book/supporters.csv | 92 ++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 35 deletions(-) diff --git a/book/supporters.csv b/book/supporters.csv index 0f65567..63a9c05 100644 --- a/book/supporters.csv +++ b/book/supporters.csv @@ -1,74 +1,90 @@ Abu, Adam, +Adele Schmitz, +Agatha, +Alanblue, +Albert, Alicia, +Amanda M., +Amanor, +Andail, Andreas Schmid, +Andrzej Mitelski, Anna G., -anonnn, -aomanor, +Anonnn, +Anthony Atkinson, Aurore, +BTSkete, Beatriz, Bee, +Ben Davies, BigWullie, Blixikan, Blusie, Brigitta, Brockman, -BTSkete, C Fazio, Cal Kotz, Case, +Cédric Andrieu, Charlene Adkins, +Chin Pui Ling, Chris DuBosq, Chris G, +Chris Toph, Christiane B, Christine, Chrysanna, Colleen Guidone, +DKitSeattle, Danieel, Daniel, David, Dee, Desiree S, -DKitSeattle, -dlenkes, -douglas.penna, -DRey, +Douglas Penna, +Drey, Duivelsjong, +Elaine Leung, Ellie, Ethan, -Francois le Danois, +François le Danois, +Fredrik, Geoff, Guillermo, -HansAndreManfredsson, +Hansandremanfredsson, Heather Currier, Hito, -IlseFA, -Inma McLeish, +Ilsefa, +Inma Mcleish, Jackie, +Jacques Lucke, Jan Chrillesen, +Jan-Pieter Van Den Wittenboer, Jane, +Jc Bell, Jenny, Jessicat, -JimJo, +Jimjo, John E Bergman, Jonathan, -JorisBelmans, Jose Lausuch, Judith Roth, Julian, Justin Dybedahl, -JZ, +Jz, Kankiti, Kathy Goldstein, -kathy word, +Kathy Word, Ken Miller, Kirill Sivy, Kuchengnom, +Laurent Bouguetaïa, Leon, Lili1232000, Lise W, Lizabeth Kelly, -lou, +Lou, Lukasz G, Manse, Marcel, @@ -77,51 +93,57 @@ Marie, Marijke, Mark, Martin, +Matthew Nowosiadly, Medea, Meghann, Melissa, -Michaela, Michaela Gáliková, -mieke, +Michaela, +Mieke, Mimi, -moj shar, -MonicaKS, +Moj Shar, +Monicaks, Nancy Anne Martin, Nancy Keary, +Nic Lecloux, Nick, -nirpf, +Nirpf, +Paaskus, Pascal H, -Paula Jean McKenney Valadez, +Paul Will, +Paula Jean Mckenney Valadez, Pauline Roberts (Capyboppy), Pitdepitis, -Rachelle and Omar, -RaptorRich, +Rachelle And Omar, +Raptorrich, Rich, -RiztheBread, -RoijalBaker, +Rizthebread, +Roijalbaker, Rori, +Ruben August Fischer, Sander, Sandy, Sarah, Scooter, Scott Mattson, -SebastianKlocke, +Sebastianklocke, Sharon Eicher, -ShelleyMierle, -SheriK, +Shelleymierle, +Sherik, +Smirnov, Spencer, -strambinha, -Sue, +Strambinha, Sue, Sune, Susan, Sven, -tbonewilly, +Tbonewilly, Thales Mello, -TheRealBruce, +Therealbruce, +Tracy \& Paul Will, Usliv, Vassil Dichev, -Vladimir Smirnov, +Vladimir Smirnov, Voicu, Zika, -Zoltan +Zoltan. From d1b0bbead13dbecc61fc571819d9fb38f6defb91 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Sun, 28 Apr 2024 10:51:41 +0200 Subject: [PATCH 2/7] Simplify build process (#352) Related to #349. This only builds the docker image on push to main. For pull requests and pushes the whole build is tested. --- .github/workflows/docker-build-push.yml | 56 ------------------- .github/workflows/release-book-website.yml | 29 +++++++++- .../test-book-website-pull-request.yml | 11 ---- .github/workflows/test-book-website-push.yml | 10 ---- .github/workflows/test-book-website.yml | 18 +++--- 5 files changed, 35 insertions(+), 89 deletions(-) delete mode 100644 .github/workflows/docker-build-push.yml delete mode 100644 .github/workflows/test-book-website-pull-request.yml delete mode 100644 .github/workflows/test-book-website-push.yml diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml deleted file mode 100644 index 98cb137..0000000 --- a/.github/workflows/docker-build-push.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Create and publish a Docker image - -on: - workflow_call: - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push-image: - runs-on: ubuntu-latest - permissions: - contents: read - packages: write - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Log in to the Container registry - uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Figure out branch name - shell: bash - run: echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT - id: extract_branch - - name: Determine docker image tag - shell: bash - id: determine_tag - run: | - if [[ "${{ github.ref }}" == "refs/heads/main" ]]; then - echo "tag=latest" >> $GITHUB_OUTPUT - else - echo "tag=${{ steps.extract_branch.outputs.branch }}" >> $GITHUB_OUTPUT - fi - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - # Buildx for caching - - uses: docker/setup-buildx-action@v3 - - name: Build and push Docker image - uses: docker/build-push-action@v5 - with: - context: . - push: true - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.determine_tag.outputs.tag }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max diff --git a/.github/workflows/release-book-website.yml b/.github/workflows/release-book-website.yml index 03c3f32..e979b29 100644 --- a/.github/workflows/release-book-website.yml +++ b/.github/workflows/release-book-website.yml @@ -4,12 +4,37 @@ on: push: branches: - main + env: - IMAGE: ghcr.io/${{ github.repository }}:latest + LATEST_IMAGE: ghcr.io/${{ github.repository }}:latest jobs: build-and-push-image: - uses: ./.github/workflows/docker-build-push.yml + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to the Container registry + uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + # Buildx for caching + - uses: docker/setup-buildx-action@v3 + - name: Build and push Docker image + uses: docker/build-push-action@v5 + with: + context: . + push: true + tags: ghcr.io/${{ github.repository }}:latest + cache-from: type=gha + cache-to: type=gha,mode=max + release-book-website: needs: build-and-push-image diff --git a/.github/workflows/test-book-website-pull-request.yml b/.github/workflows/test-book-website-pull-request.yml deleted file mode 100644 index b7fcf0e..0000000 --- a/.github/workflows/test-book-website-pull-request.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Test building book and website - -on: - pull_request: - -jobs: - - test-building-book-website: - uses: ./.github/workflows/test-book-website.yml - with: - docker-image: ghcr.io/${{ github.repository }}:latest diff --git a/.github/workflows/test-book-website-push.yml b/.github/workflows/test-book-website-push.yml deleted file mode 100644 index 04c7527..0000000 --- a/.github/workflows/test-book-website-push.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Test building book and website with default image - -on: - push: - -jobs: - test-building-book-website: - uses: ./.github/workflows/test-book-website.yml - with: - docker-image: ghcr.io/${{ github.repository }}:latest diff --git a/.github/workflows/test-book-website.yml b/.github/workflows/test-book-website.yml index 15671fc..4489eec 100644 --- a/.github/workflows/test-book-website.yml +++ b/.github/workflows/test-book-website.yml @@ -1,11 +1,9 @@ name: Test book and website for given image -on: - workflow_call: - inputs: - docker-image: - required: true - type: string +on: [push, pull_request] + +env: + DOCKER_IMAGE: ghcr.io/${{ github.repository }}:latest jobs: test-book-website: @@ -16,7 +14,7 @@ jobs: - name: Print dependency versions uses: addnab/docker-run-action@v3 with: - image: ${{ inputs.docker-image }} + image: ${{ env.DOCKER_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book @@ -24,7 +22,7 @@ jobs: - name: Print build variables uses: addnab/docker-run-action@v3 with: - image: ${{ inputs.docker-image }} + image: ${{ env.DOCKER_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book @@ -32,7 +30,7 @@ jobs: - name: Test baking the release versions uses: addnab/docker-run-action@v3 with: - image: ${{ inputs.docker-image }} + image: ${{ env.DOCKER_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book @@ -48,7 +46,7 @@ jobs: - name: Test building website uses: addnab/docker-run-action@v3 with: - image: ${{ inputs.docker-image }} + image: ${{ env.DOCKER_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book From e4bd4632c5f99fa73f9a3b699f691bda4d8fefe3 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Mon, 29 Apr 2024 07:11:53 +0200 Subject: [PATCH 3/7] Fix wrong image name in release workflow --- .github/workflows/release-book-website.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-book-website.yml b/.github/workflows/release-book-website.yml index e979b29..a64be90 100644 --- a/.github/workflows/release-book-website.yml +++ b/.github/workflows/release-book-website.yml @@ -34,7 +34,6 @@ jobs: tags: ghcr.io/${{ github.repository }}:latest cache-from: type=gha cache-to: type=gha,mode=max - release-book-website: needs: build-and-push-image @@ -45,7 +44,7 @@ jobs: - name: Print dependency versions uses: addnab/docker-run-action@v3 with: - image: ${{ env.IMAGE }} + image: ${{ env.LATEST_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book @@ -53,7 +52,7 @@ jobs: - name: Print build variables uses: addnab/docker-run-action@v3 with: - image: ${{ env.IMAGE }} + image: ${{ env.LATEST_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book @@ -61,7 +60,7 @@ jobs: - name: Bake the book uses: addnab/docker-run-action@v3 with: - image: ${{ env.IMAGE }} + image: ${{ env.LATEST_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book @@ -85,7 +84,7 @@ jobs: - name: Bake the website uses: addnab/docker-run-action@v3 with: - image: ${{ env.IMAGE }} + image: ${{ env.LATEST_IMAGE }} options: -v ${{ github.workspace }}:/app run: | cd /app/book From 52a35bb61dc29661e9ceb0f06e0979494a41d232 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Fri, 3 May 2024 23:37:26 +0200 Subject: [PATCH 4/7] Clarify stiff starter quantity (#356) This clarifies how much stiff starter to use See #348 --- book/sourdough-starter/sourdough-starter-types.tex | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/book/sourdough-starter/sourdough-starter-types.tex b/book/sourdough-starter/sourdough-starter-types.tex index 77b013c..1c0b43a 100644 --- a/book/sourdough-starter/sourdough-starter-types.tex +++ b/book/sourdough-starter/sourdough-starter-types.tex @@ -302,13 +302,16 @@ pockets of air on the sides of your container. Use your nose to smell the starter. It should have a mild smell. It also tends to smell much more alcoholic than the other starters. -When using a stiff starter, use around \qtyrange{1}{20}{\percent} starter for your +When using a stiff starter, use around \qtyrange{1}{20}{\percent} starter in terms of +baker's math for your dough. This depends on the ripeness of your starter. In summer I~typically use around -\qty{10}{\percent} and in winter around \qty{20}{\percent}. This way you can -also control the fermentation speed. -Mixing the starter can be a little bit annoying as it hardly homogenizes with -the rest of the dough. In this case you can try to dissolve the starter in the +\qtyrange{1}{10}{\percent} and in winter around \qty{20}{\percent}. This way you can +also control the fermentation speed. If it is very hot where you live, consider +lowering the starter amount to \qtyrange{1}{5}{\percent}. If it is very cold in your +area consider increasing the starter amount up to \qty{30}{\percent}. +Mixing the stiff starter can be a little bit annoying as it hardly homogenizes with +the rest of the dough. In this case, you can try to dissolve the starter in the water you are about to use for your dough. This will make mixing a lot easier. From 2d0e0b2d73a2885ab66a194d33c0e9a01c223016 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Fri, 3 May 2024 23:37:42 +0200 Subject: [PATCH 5/7] Fix flowchart border on website (#355) This fixes #345 --- book/style.css | 4 ++++ website/modify_build.rb | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/book/style.css b/book/style.css index 71665b2..cc3f9c6 100644 --- a/book/style.css +++ b/book/style.css @@ -480,6 +480,10 @@ nav.TOC span:hover, nav.TOC span:hover *, nav.TOC span.chapterToc.selected, nav. p.flowchart-image-wrapper { background: white; padding: 20px; + border-radius: var(--border-radius); + border: 2px solid var(--c-black); + display: flex; + justify-content: center; } .menu-items .menu-group:last-of-type .menu-arrow { diff --git a/website/modify_build.rb b/website/modify_build.rb index 8a7e08c..8fef8b8 100644 --- a/website/modify_build.rb +++ b/website/modify_build.rb @@ -629,7 +629,9 @@ class ModifyBuild to everyone, I have decided to make it available as a free digital download.

- One of my best Sourdough Breads + + One of my best Sourdough Breads +

However, producing and maintaining resources like this requires From 7d48364d8007635a48d98d09d7d96bbf20865c2a Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Fri, 3 May 2024 23:37:53 +0200 Subject: [PATCH 6/7] Fix confusing flow chart (#354) First flow chart is about creating a starter - the other one about maintenance. The suggested approach is slightly different. This makes it clear that one flow chart is about creating a starter. --- book/figures/fig-starter-readiness.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/figures/fig-starter-readiness.tex b/book/figures/fig-starter-readiness.tex index 3ee1ef3..50a6212 100644 --- a/book/figures/fig-starter-readiness.tex +++ b/book/figures/fig-starter-readiness.tex @@ -1,5 +1,5 @@ \begin{tikzpicture}[node distance = 3cm, auto] - \node [start] (init) {Make a starter}; + \node [start] (init) {Create a starter}; \node [decision, right of=init, node distance=3.5cm] (decision_start) {Starter last fed within 3~days?}; \node [block, right of=decision_start, text width=7em, node distance=4cm] (feed_no_branch) {Feed starter twice:\par \qty{48}{\hour} before\par \qtyrange{6}{12}{\hour} before}; From 66ae206cdc629bec945bcb117a20caefed29dcc8 Mon Sep 17 00:00:00 2001 From: Hendrik Kleinwaechter Date: Sat, 4 May 2024 02:19:08 +0200 Subject: [PATCH 7/7] Link header image to homepage --- book/style.css | 4 ++++ website/modify_build.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/book/style.css b/book/style.css index cc3f9c6..261292e 100644 --- a/book/style.css +++ b/book/style.css @@ -589,4 +589,8 @@ blockquote { background-color: var(--c-black-background); padding: 5px; } + .mobile-banner a img { + border: none; + border-radius: 0px; + } } diff --git a/website/modify_build.rb b/website/modify_build.rb index 8fef8b8..f93222c 100644 --- a/website/modify_build.rb +++ b/website/modify_build.rb @@ -392,7 +392,7 @@ class ModifyBuild def build_header_html %Q{ -

+
} end @@ -782,7 +782,7 @@ class ModifyBuild def insert_mobile_header_graphic(text) doc = build_doc(text) content = doc.css(".TOC.menu")[0] - content.after('
') + content.after('
') doc.to_html end