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 <"] -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 "] -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 }