From d4561bca03f4e1dcafea00775ab2a84f5d855813 Mon Sep 17 00:00:00 2001
From: Moritz Hoffmann <antiguru@gmail.com>
Date: Wed, 12 Feb 2025 13:53:59 +0100
Subject: [PATCH] Fix Timely master check, pin dependency version in mdbook

Signed-off-by: Moritz Hoffmann <antiguru@gmail.com>
---
 .github/workflows/deploy.yml                  | 10 +++++++--
 .github/workflows/test-timely-master.yml      |  7 ++++++-
 timely_master/Cargo.toml                      | 10 ---------
 timely_master/README.md                       |  7 -------
 .../differential-dataflow/Cargo.toml          | 21 -------------------
 timely_master/differential-dogs3/Cargo.toml   | 18 ----------------
 6 files changed, 14 insertions(+), 59 deletions(-)
 delete mode 100644 timely_master/Cargo.toml
 delete mode 100644 timely_master/README.md
 delete mode 100644 timely_master/differential-dataflow/Cargo.toml
 delete mode 100644 timely_master/differential-dogs3/Cargo.toml

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 41c27604b..5acef5c16 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -7,10 +7,16 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
-      - run: cargo install mdbook --version 0.4.31
+      - run: cargo install mdbook --version 0.4.44
+      - name: Patch sample Cargo.toml versions
+        run: |
+          export DIFFERENTIAL_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "differential-dataflow") | .version')
+          export TIMELY_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "timely") | .version')
+          sed -i "s/^differential-dataflow = .*/differential = \"$DIFFERENTIAL_VERSION\"/" mdbook/src/chapter_0/chapter_0_0.md
+          sed -i "s/^timely = .*/timely = \"$TIMELY_VERSION\"/" mdbook/src/chapter_0/chapter_0_0.md
       - run: cd mdbook && mdbook build
       - uses: JamesIves/github-pages-deploy-action@v4
         with:
diff --git a/.github/workflows/test-timely-master.yml b/.github/workflows/test-timely-master.yml
index 2af4f1c35..d198f24f5 100644
--- a/.github/workflows/test-timely-master.yml
+++ b/.github/workflows/test-timely-master.yml
@@ -19,8 +19,13 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: ${{ matrix.toolchain }}
+      - name: Cargo patch Timely master
+        run: |
+          cat >> Cargo.toml <<EOF
+          [patch.crates-io]
+          timely = { git = "https://github.com/TimelyDataflow/timely-dataflow" }
+          EOF
       - name: Cargo check against Timely master
-        working-directory: timely_master
         run: cargo check --all-targets
       - name: Cargo test against Timely master
         working-directory: timely_master
diff --git a/timely_master/Cargo.toml b/timely_master/Cargo.toml
deleted file mode 100644
index 3080b03a0..000000000
--- a/timely_master/Cargo.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is not part of the regular workspace.
-[workspace]
-members = ["differential-dataflow", "differential-dogs3"]
-resolver = "2"
-
-[workspace.dependencies]
-timely = { git = "https://github.com/TimelyDataflow/timely-dataflow", default-features = false }
-
-[patch.crates-io]
-timely = { git = "https://github.com/TimelyDataflow/timely-dataflow" }
diff --git a/timely_master/README.md b/timely_master/README.md
deleted file mode 100644
index da3923f89..000000000
--- a/timely_master/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Tests for Differential against Timely master
-
-This directory contains tests for Differential against Timely master. The tests are run in the same way as the tests
-for Differential against released versions of Timely, but the crate is replaced with the `timely` crate from Github.
-
-Nobody should ever rely on the contents of this directory for any other purpose than testing differential
-against timely master.
diff --git a/timely_master/differential-dataflow/Cargo.toml b/timely_master/differential-dataflow/Cargo.toml
deleted file mode 100644
index 9c496fb2e..000000000
--- a/timely_master/differential-dataflow/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "differential-dataflow"
-version = "0.0.0"
-authors = ["Moritz Hoffmann <antiguru@gmail.com>"]
-license = "MIT"
-edition = "2021"
-publish = false
-description = "A fake package to test differential against timely master."
-
-# Point at the regular differential crate.
-[lib]
-path = "../../src/lib.rs"
-
-# Dependencies to build against timely master. Must mirror the dependencies in the main Cargo.toml.
-[dependencies]
-fnv="1.0.2"
-serde = { version = "1.0", features = ["derive"] }
-timely = { workspace = true }
-
-[features]
-default = ["timely/getopts"]
diff --git a/timely_master/differential-dogs3/Cargo.toml b/timely_master/differential-dogs3/Cargo.toml
deleted file mode 100644
index 1fc0ecfcd..000000000
--- a/timely_master/differential-dogs3/Cargo.toml
+++ /dev/null
@@ -1,18 +0,0 @@
-[package]
-name = "differential-dogs3"
-version = "0.0.0"
-authors = ["Moritz Hoffmann <antiguru@gmail.com>"]
-license = "MIT"
-edition = "2021"
-publish = false
-description = "A fake package to test dogsdogsdogs against timely master."
-
-# Point at the regular dogsdogsdogs crate.
-[lib]
-path = "../../dogsdogsdogs/src/lib.rs"
-
-# Dependencies to build against timely master. Must mirror the dependencies in the main Cargo.toml.
-[dependencies]
-differential-dataflow = { path = "../differential-dataflow", default-features = false }
-serde = { version = "1.0", features = ["derive"] }
-timely = { workspace = true }