Skip to content

Commit

Permalink
Fix Timely master check, pin dependency version in mdbook (#568)
Browse files Browse the repository at this point in the history
Signed-off-by: Moritz Hoffmann <[email protected]>
  • Loading branch information
antiguru authored Feb 12, 2025
1 parent a07567c commit fc0b1da
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 59 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test-timely-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions timely_master/Cargo.toml

This file was deleted.

7 changes: 0 additions & 7 deletions timely_master/README.md

This file was deleted.

21 changes: 0 additions & 21 deletions timely_master/differential-dataflow/Cargo.toml

This file was deleted.

18 changes: 0 additions & 18 deletions timely_master/differential-dogs3/Cargo.toml

This file was deleted.

0 comments on commit fc0b1da

Please sign in to comment.