diff --git a/.github/actions/setup-toolchain/action.yml b/.github/actions/setup-toolchain/action.yml index d5e2594..fb2f5ab 100644 --- a/.github/actions/setup-toolchain/action.yml +++ b/.github/actions/setup-toolchain/action.yml @@ -13,9 +13,25 @@ runs: version="v0.4.40" cd /tmp - archive="mdbook-v0.4.40-x86_64-unknown-linux-gnu.tar.gz" - wget "https://github.com/rust-lang/mdBook/releases/download/v0.4.40/${archive}" + archive="mdbook-${version}-x86_64-unknown-linux-gnu.tar.gz" + wget "https://github.com/rust-lang/mdBook/releases/download/${version}/${archive}" tar xzvf "${archive}" sudo mv mdbook /usr/bin mdbook --version + + - name: Download mdbook-linkcheck + shell: bash + run: | + set +x + + version="v0.7.7" + + cd /tmp + archive="mdbook-linkcheck.x86_64-unknown-linux-gnu.zip" + wget "https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/${version}/${archive}" + unzip "${archive}" + chmod +x mdbook-linkcheck + sudo mv mdbook-linkcheck /usr/bin + + mdbook-linkcheck --version diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index bae4a86..2edaad2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -30,7 +30,7 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: 03654dab23842c712e474f409d58f55c - command: pages deploy out --project-name=makerspace-wiki + command: pages deploy ./out/html --project-name=makerspace-wiki - name: Add preview URL comment if: steps.publish.conclusion == 'success' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 07c119a..2ef1d61 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -27,4 +27,4 @@ jobs: with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: 03654dab23842c712e474f409d58f55c - command: pages deploy out --project-name=makerspace-wiki + command: pages deploy ./out/html --project-name=makerspace-wiki diff --git a/book.toml b/book.toml index dc95d7d..dcf189a 100644 --- a/book.toml +++ b/book.toml @@ -15,3 +15,6 @@ create-missing = false git-repository-url = "https://github.com/MakerSpaceNewcastle/wiki" edit-url-template = "https://github.com/MakerSpaceNewcastle/wiki/edit/main/{path}" fold.enable = true + +[output.linkcheck] +warning-policy = "error" diff --git a/src/the_space/README.md b/src/the_space/README.md index 9e055db..8cdccec 100644 --- a/src/the_space/README.md +++ b/src/the_space/README.md @@ -9,5 +9,5 @@ Maker Space is split into four main locations/sections: Prepare yourself for a Microsoft Copilot guided tour through our space. -Pretty much all of the text in the above pages was generated by asking Copilot to "in the style of an estate agent, describe [very brief description of what is in the accompanying photo] in a hackspace". +Pretty much all of the text in the above pages was generated by asking Copilot to "in the style of an estate agent, describe in a hackspace". The relevant, mostly correct, appropriate, amusing, (and if you are really lucky) actually helpful parts of the response were then selected and made into a mostly cohesive bit of prose.