Skip to content

Commit b1697ed

Browse files
max-sixtyclaude
andauthored
fix: Restore mdbook to cargo_crates and add devcontainer smoke test (#5647)
Co-authored-by: Claude <[email protected]>
1 parent 502b1a9 commit b1697ed

File tree

2 files changed

+21
-7
lines changed

2 files changed

+21
-7
lines changed

.github/workflows/build-devcontainer.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,25 @@ jobs:
5858
cache-from: type=gha,scope=${{ matrix.platform }}
5959
cache-to: type=gha,mode=max,scope=${{ matrix.platform }}
6060

61+
# Smoke test: build local image and verify tools work
62+
- name: Build local image for smoke test
63+
uses: docker/build-push-action@v6
64+
with:
65+
context: .devcontainer/base-image
66+
build-args: cargo_crates=${{ env.cargo_crates }}
67+
load: true
68+
tags: devcontainer-test:latest
69+
cache-from: type=gha,scope=${{ matrix.platform }}
70+
71+
- name: Smoke test - run tests and build book
72+
run: |
73+
docker run --rm -v "${{ github.workspace }}:/workspace" -w /workspace \
74+
devcontainer-test:latest bash -c "
75+
set -euxo pipefail
76+
cargo test
77+
mdbook build web/book/
78+
"
79+
6180
- name: Export digest
6281
if: inputs.push
6382
run: |

Taskfile.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,8 @@ vars:
4545
rust-lang.rust-analyzer
4646
cargo_crates: >
4747
bacon cbindgen cargo-audit cargo-insta cargo-llvm-cov cargo-release
48-
cargo-nextest default-target wasm-bindgen-cli wasm-opt
49-
# Lock mdbook and plugins to versions compatible with mdbook 0.4.x
50-
# (mdbook 0.5.0 has breaking changes)
51-
mdbook_crates: >
52-
48+
cargo-nextest default-target mdbook mdbook-admonish mdbook-footnote
49+
mdbook-toc wasm-bindgen-cli wasm-opt
5350
# wasm-pack waiting on https://github.com/rustwasm/wasm-pack/issues/1426
5451
#
5552
# Excluding `elixir` atm given it's not enabled on Mac and currently unsupported
@@ -132,15 +129,13 @@ tasks:
132129
# `--locked` installs from the underlying lock files (which is not the
133130
# default...)
134131
- "cargo install --locked {{.cargo_crates}}"
135-
- "cargo install --locked {{.mdbook_crates}}"
136132
- cargo install wasm-pack
137133

138134
install-cargo-tools-binstall:
139135
cmds:
140136
- cmd: cargo install --locked cargo-binstall
141137
platforms: [linux, darwin]
142138
- "cargo binstall -y --locked {{.cargo_crates}}"
143-
- "cargo binstall -y --locked {{.mdbook_crates}}"
144139
- cargo binstall -y wasm-pack
145140

146141
check-vscode-extensions:

0 commit comments

Comments
 (0)