Merge pull request #4291 from szarnyasg/bump-pandoc

CI: Bump Pandoc version
duckdb · Dec 7, 2024 · 2f4854e · 2f4854e
2 parents e6e23b4 + 7b97b14
commit 2f4854e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 10 deletions.
diff --git a/.github/workflows/build-stable-documentation.yml b/.github/workflows/build-stable-documentation.yml
@@ -25,7 +25,7 @@ jobs:
   build_pdf:
     runs-on: ubuntu-24.04
     container:
-      image: docker://pandoc/extra:3.1.1.0
+      image: docker://pandoc/extra:3.5
       options: --entrypoint=sh
     defaults:
       run:
@@ -36,9 +36,8 @@ jobs:
       - name: Setup Python
         run: |
           PYTHONUNBUFFERED=1
-          apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
-          python3 -m ensurepip
+          apk add --update --no-cache python3 py3-pip
       - name: Install Python requirements
-        run: pip3 install -r requirements.txt
+        run: pip3 install -r requirements.txt --break-system-packages
       - name: Concatenate files
         run: python3 concatenate_to_single_file.py
diff --git a/.github/workflows/jekyll.yml b/.github/workflows/jekyll.yml
@@ -83,7 +83,7 @@ jobs:
   build_pdf:
     runs-on: ubuntu-24.04
     container:
-      image: docker://pandoc/extra:3.1.1.0
+      image: docker://pandoc/extra:3.5
       options: --entrypoint=sh
     defaults:
       run:
@@ -94,10 +94,9 @@ jobs:
       - name: Setup Python
         run: |
           PYTHONUNBUFFERED=1
-          apk add --update --no-cache python3 && ln -sf python3 /usr/bin/python
-          python3 -m ensurepip
+          apk add --update --no-cache python3 py3-pip
       - name: Install dependencies
-        run: pip3 install -r requirements.txt
+        run: pip3 install -r requirements.txt --break-system-packages
       - name: Concatenate files
         run: python3 concatenate_to_single_file.py
       - name: Convert with pandoc

diff --git a/single-file-document/generate_latex.sh b/single-file-document/generate_latex.sh
@@ -5,5 +5,5 @@ set -xeuo pipefail
 # navigate to the directory of the script
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-python3 concatenate_to_single_file.py
+python concatenate_to_single_file.py
 pandoc --defaults pandoc-configuration.yaml --to=latex --output duckdb-docs.tex
diff --git a/single-file-document/generate_single_file_documentation.sh b/single-file-document/generate_single_file_documentation.sh
@@ -5,7 +5,7 @@ set -xeuo pipefail
 # navigate to the directory of the script
 cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-python3 concatenate_to_single_file.py
+python concatenate_to_single_file.py
 rm -f duckdb-docs.pdf
 
 if [ $# -ge 1 ] && [ $1 == "--docker" ]; then