Skip to content

Commit fc0b1da

Browse files
authored
Fix Timely master check, pin dependency version in mdbook (#568)
Signed-off-by: Moritz Hoffmann <[email protected]>
1 parent a07567c commit fc0b1da

File tree

6 files changed

+14
-59
lines changed

6 files changed

+14
-59
lines changed

.github/workflows/deploy.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,16 @@ on:
77

88
jobs:
99
deploy:
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
1212
- uses: actions/checkout@v4
13-
- run: cargo install mdbook --version 0.4.31
13+
- run: cargo install mdbook --version 0.4.44
14+
- name: Patch sample Cargo.toml versions
15+
run: |
16+
export DIFFERENTIAL_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "differential-dataflow") | .version')
17+
export TIMELY_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[] | select(.name == "timely") | .version')
18+
sed -i "s/^differential-dataflow = .*/differential = \"$DIFFERENTIAL_VERSION\"/" mdbook/src/chapter_0/chapter_0_0.md
19+
sed -i "s/^timely = .*/timely = \"$TIMELY_VERSION\"/" mdbook/src/chapter_0/chapter_0_0.md
1420
- run: cd mdbook && mdbook build
1521
- uses: JamesIves/github-pages-deploy-action@v4
1622
with:

.github/workflows/test-timely-master.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ jobs:
1919
- uses: actions-rust-lang/setup-rust-toolchain@v1
2020
with:
2121
toolchain: ${{ matrix.toolchain }}
22+
- name: Cargo patch Timely master
23+
run: |
24+
cat >> Cargo.toml <<EOF
25+
[patch.crates-io]
26+
timely = { git = "https://github.com/TimelyDataflow/timely-dataflow" }
27+
EOF
2228
- name: Cargo check against Timely master
23-
working-directory: timely_master
2429
run: cargo check --all-targets
2530
- name: Cargo test against Timely master
2631
working-directory: timely_master

timely_master/Cargo.toml

Lines changed: 0 additions & 10 deletions
This file was deleted.

timely_master/README.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

timely_master/differential-dataflow/Cargo.toml

Lines changed: 0 additions & 21 deletions
This file was deleted.

timely_master/differential-dogs3/Cargo.toml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)