diff --git a/local/fork-upstream-map.toml b/local/fork-upstream-map.toml index 338d5ff4df..d7aaedac44 100644 --- a/local/fork-upstream-map.toml +++ b/local/fork-upstream-map.toml @@ -38,3 +38,4 @@ kernel https://gitlab.redox-os.org/redox-os/kernel.git 0.5.12 sna bootloader https://gitlab.redox-os.org/redox-os/bootloader.git 1.0.0 snapshot installer https://gitlab.redox-os.org/redox-os/installer.git 0.2.42 snapshot userutils https://gitlab.redox-os.org/redox-os/userutils.git 0.1.0 snapshot +base https://gitlab.redox-os.org/redox-os/base.git main tracked diff --git a/local/scripts/verify-fork-versions.sh b/local/scripts/verify-fork-versions.sh index 1875906a6e..711e215e46 100755 --- a/local/scripts/verify-fork-versions.sh +++ b/local/scripts/verify-fork-versions.sh @@ -91,11 +91,8 @@ for fork_dir in local/sources/*/; do continue fi - # Snapshot forks: skip content comparison (unrelated git histories). - # Version format and suffix are still verified above. - if [ "$fork_mode" = "snapshot" ]; then - continue - fi + # snapshot mode no longer skips content check — must match upstream tag. + # Fetch the upstream tag's tree hash upstream_hash=$(cd /tmp && git ls-remote --tags "$upstream_url" "refs/tags/$upstream_tag" 2>/dev/null | awk '{print $1}' | head -1)