mirror of
https://github.com/marcoallegretti/WEFT_OS.git
synced 2026-11-22 08:13:59 +00:00
chore(hooks): also fetch stylo's servo-weft branch in session setup
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QS8QcxvhVJwU3X2qhPamUW
This commit is contained in:
parent
c9c77886e2
commit
e153f88ff7
1 changed files with 9 additions and 5 deletions
|
|
@ -41,14 +41,18 @@ if [ -d "$SERVO_DIR" ]; then
|
||||||
--profile minimal -c clippy,rustfmt,llvm-tools,rustc-dev,rust-src
|
--profile minimal -c clippy,rustfmt,llvm-tools,rustc-dev,rust-src
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# WEFT pins servo's `servo-weft` branch; make sure it is available locally.
|
# WEFT pins servo's `servo-weft` branch, which in turn uses stylo's
|
||||||
if [ -d "$SERVO_DIR/.git" ]; then
|
# `servo-weft` branch; make sure both are available locally.
|
||||||
git -C "$SERVO_DIR" rev-parse --verify -q origin/servo-weft >/dev/null ||
|
for repo in "$SERVO_DIR" "$STYLO_DIR"; do
|
||||||
git -C "$SERVO_DIR" fetch --depth=50 origin servo-weft:refs/remotes/origin/servo-weft || true
|
if [ -d "$repo/.git" ]; then
|
||||||
|
git -C "$repo" rev-parse --verify -q origin/servo-weft >/dev/null ||
|
||||||
|
git -C "$repo" fetch --depth=50 origin servo-weft:refs/remotes/origin/servo-weft || true
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
# Point WEFT at the local servo fork and WEFT + servo at the local stylo fork.
|
# Point WEFT at the local servo fork and WEFT + servo at the local stylo fork.
|
||||||
# These patches rewrite Cargo.lock `source` lines; don't commit those hunks.
|
# These patches rewrite Cargo.lock `source` lines; don't commit those hunks.
|
||||||
|
# Check out the `servo-weft` work in both forks before building servo-embed.
|
||||||
if [ -d "$SERVO_DIR" ] && [ -d "$STYLO_DIR" ]; then
|
if [ -d "$SERVO_DIR" ] && [ -d "$STYLO_DIR" ]; then
|
||||||
mkdir -p "$PARENT_DIR/.cargo"
|
mkdir -p "$PARENT_DIR/.cargo"
|
||||||
cat > "$PARENT_DIR/.cargo/config.toml" <<CFG
|
cat > "$PARENT_DIR/.cargo/config.toml" <<CFG
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue