Skip to content

Commit

Permalink
Always install and run mdbook-pandoc
Browse files Browse the repository at this point in the history
Before, we only installed and ran `mdbook-pandoc` when publishing the
course — which means that a PR change could accidentally break the
publish workflow. We now test that it works on every PR.

From a discussion in #1704.
  • Loading branch information
mgeisler committed Feb 27, 2024
1 parent dc4a1eb commit faf6a43
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ else
fi

mdbook build -d "$dest_dir"
if [ -f "$dest_dir/pandoc/pdf/comprehensive-rust.pdf" ]; then
mv "$dest_dir/pandoc/pdf/comprehensive-rust.pdf" "$dest_dir/html/"
fi
mv "$dest_dir/pandoc/pdf/comprehensive-rust.pdf" "$dest_dir/html/"
(cd "$dest_dir/exerciser" && zip --recurse-paths ../html/comprehensive-rust-exercises.zip comprehensive-rust-exercises/)

echo "::endgroup::"
8 changes: 8 additions & 0 deletions .github/workflows/install-mdbook/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ runs:
run: cargo install mdbook-svgbob --locked --version 0.2.1
shell: bash

- name: Install mdbook-pandoc and related dependencies
run: |
cargo install mdbook-pandoc --locked --version 0.5.0
sudo apt-get install -y texlive texlive-luatex texlive-lang-cjk librsvg2-bin fonts-noto
curl -LsSf https://github.com/jgm/pandoc/releases/download/3.1.11/pandoc-3.1.11-linux-amd64.tar.gz | tar zxf -
echo "$PWD/pandoc-3.1.11/bin" >> $GITHUB_PATH
shell: bash

- name: Install mdbook-i18n-helpers
run: cargo install mdbook-i18n-helpers --locked --version 0.3.1
shell: bash
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,6 @@ jobs:
- name: Install mdbook
uses: ./.github/workflows/install-mdbook

- name: Install mdbook-pandoc and related dependencies
run: |
cargo install mdbook-pandoc --locked --version 0.5.0
sudo apt-get install -y texlive texlive-luatex texlive-lang-cjk librsvg2-bin fonts-noto
curl -LsSf https://github.com/jgm/pandoc/releases/download/3.1.11/pandoc-3.1.11-linux-amd64.tar.gz | tar zxf -
echo "$PWD/pandoc-3.1.11/bin" >> $GITHUB_PATH
- name: Build course in English
run: .github/workflows/build.sh en book

Expand Down

0 comments on commit faf6a43

Please sign in to comment.