Merge upstream changes (#205)

* Merge upstream changes

* Fix spelling errors

* Fix "broken" "references"

* Disable link checker for now

* Disable ref checker too

* Bump mdbook-quiz and mdbook-aquascope versions

.github/workflows/main.yml

@@ -9,8 +9,8 @@ on:
 env:
   RUST_LIB_BACKTRACE: 1
   RAYON_NUM_THREADS: 1
-  MDBOOK_QUIZ_VERSION: 0.3.3
-  AQUASCOPE_VERSION: 0.3.1
+  MDBOOK_QUIZ_VERSION: 0.3.6
+  AQUASCOPE_VERSION: 0.3.2
   AQUASCOPE_TOOLCHAIN: nightly-2023-08-25
 
 jobs:
@@ -22,7 +22,7 @@ jobs:
 
     - uses: actions/setup-node@v3
       with:
-        node-version: 16
+        node-version: 20
 
     - uses: pnpm/action-setup@v2
       with:
@@ -34,8 +34,8 @@ jobs:
     - name: Install Rust
       run: |
         rustup set profile minimal
-        rustup toolchain install 1.70 -c rust-docs
-        rustup default 1.70
+        rustup toolchain install 1.79 -c rust-docs
+        rustup default 1.79
 
     - name: Install Depot
       run: curl https://raw.githubusercontent.com/cognitive-engineering-lab/depot/main/scripts/install.sh | sh
@@ -66,7 +66,53 @@ jobs:
       run: |
         cd js-extensions
         pnpm init-repo
+ 
+    - name: Run `tools` package tests
+      run: |
+        cargo test
+
+    - name: Run `mdbook-trpl-note` package tests
+      working-directory: packages/mdbook-trpl-note
+      run: |
+        cargo test
 
+    - name: Run `mdbook-trpl-listing` package tests
+      working-directory: packages/mdbook-trpl-listing
+      run: |
+        cargo test
+
+    - name: Install mdbook-trpl-note
+      run: cargo install --path packages/mdbook-trpl-note
+    - name: Install mdbook-trpl-listing
+      run: cargo install --path packages/mdbook-trpl-listing
+    - name: Install aspell
+      run: sudo apt-get install aspell
+    - name: Install shellcheck
+      run: sudo apt-get install shellcheck
+    - name: Report versions
+      run: |
+        rustup --version
+        rustc -Vv
+        mdbook --version
+        aspell --version
+        shellcheck --version
+    - name: Shellcheck
+      run: find ci tools -name '*.sh' | xargs shellcheck
+    - name: Spellcheck
+      run: bash ci/spellcheck.sh list
+    - name: Lint for local file paths
+      run: |
+        mdbook build
+        cargo run --bin lfp src
+    # - name: Validate references
+    #   run: bash ci/validate.sh
+    # - name: Check for broken links
+    #   run: |
+    #     curl -sSLo linkcheck.sh \
+    #       https://raw.githubusercontent.com/rust-lang/rust/master/src/tools/linkchecker/linkcheck.sh
+    #     # Cannot use --all here because of the generated redirect pages aren't available.
+    #     sh linkcheck.sh book
+
     - name: Run mdbook tests
       run: mdbook test
 

.gitignore

@@ -7,4 +7,5 @@ tmp
 
 /src/quiz
 /src/aquascope
-.aquascope-cache
+.aquascope-cache
+.nova

ADMIN_TASKS.md

@@ -68,7 +68,7 @@ extracted into a file. To do that:
 - If you only want to show part of the code in the file, use anchor comments
   (`// ANCHOR: some_tag` and `// ANCHOR_END: some_tag`) to mark the parts of
 	the file you want to show.
-- For Rust code, use the `{{#rustdoc_include [fileame:some_tag]}}` directive
+- For Rust code, use the `{{#rustdoc_include [filename:some_tag]}}` directive
   within the code blocks in the text. The `rustdoc_include` directive gives the
 	code that doesn't get displayed to `rustdoc` for `mdbook test` purposes.
 - For anything else, use the `{{#include [filename:some_tag]}}` directive.

CONTRIBUTING.md

@@ -70,4 +70,4 @@ a new language! We're waiting on [mdbook support] for multiple languages
 before we merge any in, but feel free to start!
 
 [Translations]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3ATranslations
-[mdbook support]: https://github.com/rust-lang-nursery/mdBook/issues/5
+[mdbook support]: https://github.com/rust-lang/mdBook/issues/5