Skip to content

Improve build change detection #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
afrind wants to merge 2 commits into from
Closed

Improve build change detection #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38755c9
Bump moxygen submodule to 507877f6 (pin picoquic getdeps manifest to …
afrind Mar 13, 2026
147d4cd
Improve build change detection
afrind Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/moxygen
Open in desktop
Submodule moxygen updated 7 files
+2 −2 build/fbcode_builder/manifests/picoquic
+4 −4 moxygen/MoQFramer.cpp
+21 −0 moxygen/MoQSession.cpp
+1 −0 moxygen/MoQSession.h
+72 −3 moxygen/test/MoQSessionPublishTests.cpp
+6 −0 moxygen/test/MoQSessionTestCommon.cpp
+2 −0 moxygen/test/MoQSessionTestCommon.h
1 change: 1 addition & 0 deletions scripts/build-meta-deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ build_dep() {

cmake --build "$build_dir"
cmake --install "$build_dir"
git -C "$src" rev-parse HEAD > "${inst_dir}/.build-rev"
echo "${name} done."
}

Expand Down
54 changes: 51 additions & 3 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
SCRATCH="${ORLY_SCRATCH_PATH:-${PROJECT_ROOT}/.scratch}"

HASHES_DIR="${PROJECT_ROOT}/deps/moxygen/build/deps/github_hashes"
MANIFESTS_DIR="${PROJECT_ROOT}/deps/moxygen/build/fbcode_builder/manifests"
META_HASH_FILE="${SCRATCH}/meta-deps.hash"
MANIFESTS_HASH_FILE="${SCRATCH}/manifests.hash"
MOXYGEN_REV_FILE="${SCRATCH}/moxygen.rev"
PREFIX_PATH_FILE="${SCRATCH}/cmake_prefix_path.txt"

Expand All @@ -23,6 +25,25 @@ needs_setup() {
[[ ! -f "$PREFIX_PATH_FILE" ]]
}

manifests_hash() {
local deps
deps=$(python3 "${MANIFESTS_DIR}/../getdeps.py" list-deps moxygen 2>/dev/null)
local files=()
for dep in $deps; do
files+=("${MANIFESTS_DIR}/${dep}")
done
cat "${files[@]}" 2>/dev/null | sha256sum | awk '{print $1}'
}

manifests_changed() {
local current
current=$(manifests_hash)
if [[ ! -f "$MANIFESTS_HASH_FILE" ]] || [[ "$current" != "$(cat "$MANIFESTS_HASH_FILE")" ]]; then
return 0
fi
return 1
}

meta_deps_hash() {
cat "$HASHES_DIR"/*/*-rev.txt 2>/dev/null | sha256sum | awk '{print $1}'
}
Expand All @@ -36,6 +57,19 @@ meta_deps_changed() {
return 1
}

meta_deps_installed() {
local inst_dir="${SCRATCH}/installed"
for key in "${!REPO_DIRS[@]}"; do
local name
name=$(basename "$key")
local pinned
pinned=$(awk '{print $3}' "${HASHES_DIR}/${key}-rev.txt" 2>/dev/null) || return 1
local stamp="${inst_dir}/${name}/.build-rev"
[[ -f "$stamp" ]] && [[ "$(cat "$stamp")" == "$pinned" ]] || return 1
done
return 0
}

moxygen_rev() {
git -C "${PROJECT_ROOT}/deps/moxygen" rev-parse HEAD
}
Expand Down Expand Up @@ -92,14 +126,23 @@ warn_stale_patches() {
save_stamps() {
mkdir -p "$SCRATCH"
meta_deps_hash > "$META_HASH_FILE"
manifests_hash > "$MANIFESTS_HASH_FILE"
moxygen_rev > "$MOXYGEN_REV_FILE"
local inst_dir="${SCRATCH}/installed"
for key in "${!REPO_DIRS[@]}"; do
local name
name=$(basename "$key")
local repo_dir="${SCRATCH}/repos/${REPO_DIRS[$key]}"
[[ -d "$repo_dir" ]] && git -C "$repo_dir" rev-parse HEAD > "${inst_dir}/${name}/.build-rev"
done
}

# --- Main ---

if needs_setup; then
echo "No prior build found. Running initial setup..."
"${SCRIPT_DIR}/setup-deps.sh"
update_meta_repos
"${SCRIPT_DIR}/configure.sh"
save_stamps
cmake --build "${PROJECT_ROOT}/build"
Expand All @@ -108,10 +151,13 @@ fi

NEED_CONFIGURE=false

if meta_deps_changed; then
echo "Meta dep pinned revisions changed."
if manifests_changed; then
echo "Manifest files changed. Re-running full dependency setup..."
"${SCRIPT_DIR}/setup-deps.sh"
NEED_CONFIGURE=true
elif meta_deps_changed || ! meta_deps_installed; then
echo "Meta dep pinned revisions changed or installs incomplete."
has_stale_patches && warn_stale_patches
update_meta_repos
"${SCRIPT_DIR}/build-meta-deps.sh"
NEED_CONFIGURE=true
elif moxygen_changed; then
Expand All @@ -121,6 +167,8 @@ elif moxygen_changed; then
NEED_CONFIGURE=true
fi

update_meta_repos

if [[ "$NEED_CONFIGURE" == true ]]; then
"${SCRIPT_DIR}/configure.sh"
fi
Expand Down
Loading