Merge pull request #256 from xen0n/fix-source-tarball-layour

Fix directory layout of source tarballs
ruyisdk · Jan 6, 2025 · 8ee81b4 · 8ee81b4
2 parents e88263b + 527087e
commit 8ee81b4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/scripts/make-reproducible-source-tarball.sh b/scripts/make-reproducible-source-tarball.sh
@@ -50,14 +50,14 @@ main() {
 
     git clone "$REPO_ROOT" "$TMPDIR/$staging_dirname"
     pushd "$TMPDIR/$staging_dirname" > /dev/null
-
     # remove Git metadata
     rm -rf .git
-
     # set all file timestamps to $SOURCE_EPOCH
     find . -exec touch -md "$source_epoch" '{}' '+'
+    popd > /dev/null
 
-    reproducible_tar -cf - . | reproducible_gzip > "$dest_dir/$artifact_name"
+    pushd "$TMPDIR" > /dev/null
+    reproducible_tar -cf - "./$staging_dirname" | reproducible_gzip > "$dest_dir/$artifact_name"
     popd > /dev/null
 
     echo "info: repo HEAD content is reproducibly packed at $dest_dir/$artifact_name"