Skip to content

fix: canonicalize relative OpenWrt work directories #19

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

Merged
tifycloud merged 1 commit into from
Jul 22, 2026
Merged

fix: canonicalize relative OpenWrt work directories #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions scripts/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@ case "$NEXAWRT_FLAVOR" in
;;
esac
WORK_DIR="${WORK_DIR:-$DEFAULT_WORK_DIR}"
# Keep the source checkout path stable after this script changes directory into
# it. Relative WORK_DIR values are common in GitHub Actions; without converting
# them once at entry, later `git -C "$WORK_DIR"` checks would resolve the path a
# second time from inside the checkout and reject the otherwise canonical
# origin.
if [[ "$WORK_DIR" != /* ]]; then
WORK_DIR="$(pwd -P)/$WORK_DIR"
fi

usage() {
cat <<USAGE
Expand Down
18 changes: 18 additions & 0 deletions tests/test_source_fetch_policy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,24 @@ run_prepare "$REUSE_WORK" "$REUSE_FETCH_LOG" 1 >/dev/null
cmp -s -- "$REUSE_WORK/version" <(printf 'r0-%s\n' "${SOURCE_COMMIT:0:8}")
echo 'complete canonical source offline reuse replaces ignored stale revision: OK'

# GitHub Actions commonly supplies a repository-relative WORK_DIR. The prepare
# script changes into that checkout, so it must canonicalize the path before
# later git -C checks rather than resolving the same relative path twice.
RELATIVE_PARENT="$TMP_DIR/relative-parent"
RELATIVE_WORK="$RELATIVE_PARENT/.work/relative-work"
RELATIVE_FETCH_LOG="$TMP_DIR/relative-fetch.log"
mkdir -p "$RELATIVE_PARENT"
(
cd "$RELATIVE_PARENT"
run_prepare '.work/relative-work' "$RELATIVE_FETCH_LOG" 0 >/dev/null
)
[[ "$("$REAL_GIT" -C "$RELATIVE_WORK" rev-parse HEAD)" == "$SOURCE_COMMIT" ]]
[[ "$("$REAL_GIT" -C "$RELATIVE_WORK" config --get-all remote.origin.url)" == "$FIXTURE_REPO" ]]
! "$REAL_GIT" -C "$RELATIVE_WORK" config --get-all remote.origin.pushurl >/dev/null 2>&1
[[ "$(cat "$RELATIVE_WORK/tracked.txt")" == prepared ]]
cmp -s -- "$RELATIVE_WORK/version" <(printf 'r0-%s\n' "${SOURCE_COMMIT:0:8}")
echo 'repository-relative source work directory remains canonical after chdir: OK'


assert_source_history_override_rejected() {
local description="$1"
Expand Down
Loading