use worktree for building

Author: minichma

build.sh

@@ -17,14 +17,16 @@ set -e
 # read settings file
 . ./settings.config
 
-if ! git diff-index --quiet HEAD --; then
-    echo "Error: Git worktree is not clean. Please commit or stash your changes before proceeding."
-    exit 1
-fi
-
 echo "Building vzic"
 eval "make -C '`pwd`/vzic' -B OLSON_DIR=tzdata $VZIC_MAKE_ARGS"
 
+rm work -rf
+git worktree prune
+git worktree add work
+
+if [ ! -d build ]; then mkdir -p build; fi
+if [ ! -d build/out ]; then mkdir -p build/out; fi
+
 tzversions=$(wget -q -O - $VZIC_TZDB_RELEASES_URL | grep -oP 'tzdata\K[\d]+[a-z](?=\.tar\.gz)' | awk '{print ($0 ~ /^9/ ? "19" $0 : $0)}' | sort | uniq)
 
 # Filter tzversions to skip versions before VZIC_START_RELEASE_NAME
@@ -37,6 +39,7 @@ for version in $tzversions; do
 
     if git rev-parse "$tagname" >/dev/null 2>&1; then
         echo "Tag $tagname already exists. Skipping version $version."
+        git -C work checkout "$tagname"
         continue
     fi
 
@@ -51,9 +54,9 @@ for version in $tzversions; do
 
     if [[ ${VZIC_TZDATA_ARCHIVE_PATH} ]]; then
         echo "Extracting new tzdata"
-        if [ -d tzdata ]; then rm -rf tzdata; fi
-        mkdir -p tzdata
-        tar -xzf $VZIC_TZDATA_ARCHIVE_PATH -C tzdata
+        if [ -d work/tzdata ]; then rm -rf work/tzdata; fi
+        mkdir -p work/tzdata
+        tar -xzf $VZIC_TZDATA_ARCHIVE_PATH -C work/tzdata
 
         cp $VZIC_TZDATA_ARCHIVE_PATH build/out
     fi
@@ -66,7 +69,7 @@ for version in $tzversions; do
     export VZIC_ZONEINFO_NEW=`pwd`/build/zoneinfo
 
     if [[ -d zoneinfo ]]; then
-        export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
+        export VZIC_ZONEINFO_MASTER=`pwd`/work/zoneinfo
 
         echo "Merging..."
         ./vzic/vzic-merge.pl
@@ -75,8 +78,8 @@ for version in $tzversions; do
         cp -r $VZIC_ZONEINFO_NEW/zones.* $VZIC_ZONEINFO_MASTER 
 
     else
-        cp -r "$VZIC_ZONEINFO_NEW" zoneinfo
-        export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
+        cp -r "$VZIC_ZONEINFO_NEW" work/zoneinfo
+        export VZIC_ZONEINFO_MASTER=`pwd`/work/zoneinfo
         echo "No master zoneinfo configured. The new zoneinfo will not be merged and kept as is."
     fi
 
@@ -86,9 +89,9 @@ for version in $tzversions; do
     tar -czf "$VZIC_OUT_TAR" * 
     popd
 
-    git add .
+    git -C work add .
 
-    git commit -m "Update zoneinfo to $VZIC_RELEASE_NAME"
-    git tag -a "$tagname" -m "Release $VZIC_RELEASE_NAME"
+    git -C work commit -m "Update zoneinfo to $VZIC_RELEASE_NAME"
+    git -C work tag -a "$tagname" -m "Release $VZIC_RELEASE_NAME"
 
-done
+done