CI fixes

Signed-off-by: Moritz Hoffmann <[email protected]>
antiguru · Jul 10, 2023 · d56ad46 · d56ad46
1 parent 2231de1
commit d56ad46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
-      - run: cargo install mdbook --version 0.4.20
+      - run: cargo install mdbook --version 0.4.31
       - run: cd mdbook && mdbook build
       - uses: JamesIves/github-pages-deploy-action@v4
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,12 +7,12 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
-    - run: rustup update 1.60 --no-self-update && rustup default 1.60
+    - run: rustup update 1.70 --no-self-update && rustup default 1.70
     - run: cargo build
     - name: test mdBook
       # rustdoc doesn't build dependencies, so it needs to run after `cargo build`,
       # but its dependency search gets confused if there are multiple copies of any
       # dependency in target/debug/deps, so it needs to run before `cargo test` et al.
       # clutter target/debug/deps with multiple copies of things.
-      run: for file in $(find mdbook -name '*.md'); do rustdoc --test $file  -L ./target/debug/deps; done
+      run: for file in $(find mdbook -name '*.md' | sort); do rustdoc --test $file  -L ./target/debug/deps; done
     - run: cargo test
diff --git a/mdbook/src/chapter_2/chapter_2_4.md b/mdbook/src/chapter_2/chapter_2_4.md
@@ -38,7 +38,6 @@ However, by introducing `consolidate`
 # use timely::dataflow::Scope;
 # use differential_dataflow::Collection;
 # use differential_dataflow::lattice::Lattice;
-# use differential_dataflow::operators::Consolidate;
 # fn example<G: Scope>(manages: &Collection<G, (u64, u64)>)
 # where G::Timestamp: Lattice
 # {
@@ -56,4 +55,4 @@ we are guaranteed to see at most one `(0,0)` update at each time:
 ((0, 0), 0, 2)
 ```
 
-The `consolidate` operator is mostly useful before `inspect`ing data, but it can also be important for efficiency; knowing when to spend the additional computation to consolidate the representation of your data is an advanced topic!
+The `consolidate` function is mostly useful before `inspect`ing data, but it can also be important for efficiency; knowing when to spend the additional computation to consolidate the representation of your data is an advanced topic!