Merge remote-tracking branch 'upstream/main' into 225-ebook-situation

2025-11-14 15:11:11 -06:00 · 2024-05-25 21:55:33 +01:00
parent 92c5e418b3 66ae206cdc
commit 266de7b7ee
10 changed files with 117 additions and 137 deletions
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -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
--- a/.github/workflows/release-book-website.yml
+++ b/.github/workflows/release-book-website.yml
@@ -4,12 +4,36 @@ 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
@@ -20,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
@@ -28,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
@@ -36,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
@@ -60,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
--- a/.github/workflows/test-book-website-pull-request.yml
+++ b/.github/workflows/test-book-website-pull-request.yml
@@ -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
--- a/.github/workflows/test-book-website-push.yml
+++ b/.github/workflows/test-book-website-push.yml
@@ -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
--- 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
--- 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};
--- 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.


--- 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 {
@@ -585,4 +589,8 @@ blockquote {
    background-color: var(--c-black-background);
    padding: 5px;
  }
+  .mobile-banner a img {
+    border: none;
+    border-radius: 0px;
+  }
 }
--- 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.
--- a/website/modify_build.rb
+++ b/website/modify_build.rb
@@ -392,7 +392,7 @@ class ModifyBuild

  def build_header_html
    %Q{
-      <div class="header"><img src="banner.png"></div>
+      <div class="header"><a href="/"><img src="banner.png"></a></div>
    }
  end

@@ -629,7 +629,9 @@ class ModifyBuild
       to everyone, I have decided to make it available as a free digital download.
    </p>

-    <img alt="One of my best Sourdough Breads" class="home-bread" src="bread.jpg" />
+    <a href="bread.jpg">
+      <img alt="One of my best Sourdough Breads" class="home-bread" src="bread.jpg" />
+    </a>

    <p class="noindent">
      However, producing and maintaining resources like this requires
@@ -780,7 +782,7 @@ class ModifyBuild
  def insert_mobile_header_graphic(text)
    doc = build_doc(text)
    content = doc.css(".TOC.menu")[0]
-    content.after('<div class="mobile-banner"><img src="banner.png" /></div>')
+    content.after('<div class="mobile-banner"><a href="/"><img src="banner.png" /></a></div>')
    doc.to_html
  end