Merge branch 'feature/autobuild'

minichma · minichma · commit 55ee7a356aa8 · 2025-03-20T00:27:08.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1,12 @@
-
-# don't modify the line endings of generated zoneinfo files (they use CRLF according to the specification).
-/zoneinfo/**/*.ics text eol=crlf
-
-/settings.config text eol=lf
+
+# don't modify the line endings of generated zoneinfo files (they use CRLF according to the specification).
+/zoneinfo/**/*.ics text eol=crlf
+
+/tzdb_version.txt text eol=lf
+/zoneinfo/zones.h text eol=lf
+/zoneinfo/zones.tab text eol=lf
+
+/tzdata/** text eol=lf
+
+/settings.config text eol=lf
+/*.sh text eol=lf
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,57 +1,37 @@
 name: Build and run on GitHub Actions
 
 on:
-  push:
-    branches: [ "**" ]
+  workflow_dispatch:
+  schedule:
+    - cron: '41 4 * * *'
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-
     - uses: actions/checkout@v3
       with:
-        repository: libical/vzic
-        ref: 4768ec8008a5af34f164439e605987e2933d471a
-        path: build/vzic
+        submodules: true
 
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y libglib2.0-dev
 
-    - name: Get settings into GitHub Actions
-      run: |
-        . ./settings.config
-        echo "VZIC_RELEASE_NAME=$VZIC_RELEASE_NAME" >> $GITHUB_ENV
-
-    - name: Run build script
-      run: ./build.sh
-
-    - name: Check, whether anything has changed.
-      run: |
-        if [[ `git status --porcelain` ]]; then
-          echo "File changes detected. Will commit and push."
-          echo "VZIC_PUSH_CHANGES=1" >> $GITHUB_ENV
-        else
-          echo "No file changes detected."
-          echo "VZIC_PUSH_CHANGES=0" >> $GITHUB_ENV
-        fi
-
-    - name: Commit and push changes
-      if: ${{ env.VZIC_PUSH_CHANGES == 1 }}
+    - name: Configure git
       run: |
           git config --global user.name 'GitHub Actions'
           git config --global user.email 'tzdbics@users.noreply.github.com'
-          git add .
-          git commit -am "Update tzdata and zoneinfo to version $VZIC_RELEASE_NAME."
-          git push
 
-    - name: Archive artifacts
-      if: ${{ env.VZIC_PUSH_CHANGES == 1 }}
+    - name: Run the build script
+      run: ./build.sh
+
+    - name: Archive artifacts if any
       uses: actions/upload-artifact@v4
       with:
-        name: tzdbics_${{ env.VZIC_RELEASE_NAME }}
+        name: tzdbics_artifacts
         path: build/out/
-        if-no-files-found: error
+        if-no-files-found: ignore
+
+    - name: Push changes
+      run: git push
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "vzic"]
+	path = vzic
+	url = https://github.com/libical/vzic
diff --git a/Makefile b/Makefile
diff --git a/README.md b/README.md
@@ -1,26 +1,26 @@
-# IANA Time Zone Database to iCalendar Translation Database
-
-This repo tracks releases of the [IANA Time Zone Database](https://www.iana.org/time-zones) together with the corresponding translations to the iCalendar format (as defined in RFC 5545).
-
-The translation is performed using [libical's VZIC utility](https://github.com/libical/vzic).
-
-## Updating to a new release of the Time Zone Database
-
-The intended usage is as follows:
-* Upon a new release of the IANA Time Zone Database update `settings.config`. Update `VZIC_RELEASE_NAME` to match the name of the new release (e.g. `2022a`).
-* Commit and push the change to GitHub.
-
-This will trigger a GitHub Workflow that does the following
-* Download the specified version of the IANA Time Zone DB.
-* Checkout, build and run vzic
-* Merge the newly generated zoneinfo with the previous version, in order to keep TZIDs of unchanged time zones.
-* Commit and push the updated tzdata and zoneinfo back to the repo on GitHub.
-
-## Creating a release
-
-To create a new release:
-
-* Bump and push `VZIC_RELEASE_NAME` as outlined above.
-* Create a tag named `release_$VZIC_RELEASE_NAME` on the commit created by GitHub Actions.
-* Create a GitHub release with the same name on the new tag.
-  * Add the build artifacts from the automatic build (should be `tzdata$VZIC_RELEASE_NAME.tar.gz` and `zoneinfo-$VZIC_RELEASE_NAME.tar.gz`).
+# IANA Time Zone Database to iCalendar Translation Database
+
+This repo tracks releases of the [IANA Time Zone Database](https://www.iana.org/time-zones) together with the corresponding translations to the iCalendar format (as defined in RFC 5545).
+
+The translation is performed using [libical's VZIC utility](https://github.com/libical/vzic).
+
+## Updating to a new release of the Time Zone Database
+
+The intended usage is as follows:
+* Upon a new release of the IANA Time Zone Database update `settings.config`. Update `VZIC_RELEASE_NAME` to match the name of the new release (e.g. `2022a`).
+* Commit and push the change to GitHub.
+
+This will trigger a GitHub Workflow that does the following
+* Download the specified version of the IANA Time Zone DB.
+* Checkout, build and run vzic
+* Merge the newly generated zoneinfo with the previous version, in order to keep TZIDs of unchanged time zones.
+* Commit and push the updated tzdata and zoneinfo back to the repo on GitHub.
+
+## Creating a release
+
+To create a new release:
+
+* Bump and push `VZIC_RELEASE_NAME` as outlined above.
+* Create a tag named `release_$VZIC_RELEASE_NAME` on the commit created by GitHub Actions.
+* Create a GitHub release with the same name on the new tag.
+  * Add the build artifacts from the automatic build (should be `tzdata$VZIC_RELEASE_NAME.tar.gz` and `zoneinfo-$VZIC_RELEASE_NAME.tar.gz`).
diff --git a/build.sh b/build.sh
@@ -17,52 +17,80 @@ set -e
 # read settings file
 . ./settings.config
 
-echo "Building $VZIC_RELEASE_NAME"
+echo "Building vzic"
+eval "make -C '`pwd`/vzic' -B OLSON_DIR=tzdata $VZIC_MAKE_ARGS"
 
-mkdir -p build/out
+if [ ! -d build ]; then mkdir -p build; fi
+if [ ! -d build/out ]; then mkdir -p build/out; fi
 
-if [[ ${VZIC_TZDATA_ARCHIVE_URL} ]]; then
-    echo "Downloading tzdata from $VZIC_TZDATA_ARCHIVE_URL"
-    wget -q -O build/tzdata$VZIC_RELEASE_NAME.tar.gz $VZIC_TZDATA_ARCHIVE_URL
-    export VZIC_TZDATA_ARCHIVE_PATH=build/tzdata$VZIC_RELEASE_NAME.tar.gz
+if [ -f tzdb_version.txt ]; then
+    VZIC_CURRENT_RELEASE_NAME=$(cat tzdb_version.txt)
+    echo "Start version set to $VZIC_CURRENT_RELEASE_NAME from tzdb_version.txt"
+else
+    echo "tzdb_version.txt not found. Exiting."
+    exit 1
 fi
 
-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
+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)
 
-    cp $VZIC_TZDATA_ARCHIVE_PATH build/out
-fi
+# Filter tzversions to skip versions before VZIC_CURRENT_RELEASE_NAME
+tzversions=$(echo "$tzversions" | awk -v start="$VZIC_CURRENT_RELEASE_NAME" '$0 > start')
 
-echo "Building vzic"
-eval "make -C '`pwd`/build/vzic' -B OLSON_DIR=tzdata $VZIC_MAKE_ARGS"
+export VZIC_RELEASE_NAME=
 
-echo "Running vzic"
-if [ -d build/zoneinfo ]; then rm -r build/zoneinfo; fi
-mkdir -p build/zoneinfo
-eval "./build/vzic/vzic --olson-dir tzdata --output-dir build/zoneinfo $VZIC_INVOCATION_ARGS"
+for version in $tzversions; do
 
-export VZIC_ZONEINFO_NEW=`pwd`/build/zoneinfo
+    export VZIC_RELEASE_NAME=$version
 
-if [[ -d zoneinfo ]]; then
-    export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
+    echo "Processing version: $version";
 
-    echo "Merging..."
-    ./vzic-merge.pl
+    export VZIC_TZDATA_ARCHIVE_URL=$VZIC_TZDB_RELEASES_URL/tzdata$VZIC_RELEASE_NAME.tar.gz
+    if [[ ${VZIC_TZDATA_ARCHIVE_URL} ]]; then
+        echo "Downloading tzdata from $VZIC_TZDATA_ARCHIVE_URL"
+        wget -q -O build/tzdata$VZIC_RELEASE_NAME.tar.gz $VZIC_TZDATA_ARCHIVE_URL
+        export VZIC_TZDATA_ARCHIVE_PATH=build/tzdata$VZIC_RELEASE_NAME.tar.gz
+    fi
 
-    # copy updated zones
-    cp -r $VZIC_ZONEINFO_NEW/zones.* $VZIC_ZONEINFO_MASTER 
+    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
 
-else
-    cp -r "$VZIC_ZONEINFO_NEW" zoneinfo
-    export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
-    echo "No master zoneinfo configured. The new zoneinfo will not be merged and kept as is."
-fi
+        cp $VZIC_TZDATA_ARCHIVE_PATH build/out
+    fi
+
+    echo "Running vzic"
+    if [ -d build/zoneinfo ]; then rm -r build/zoneinfo; fi
+    mkdir -p build/zoneinfo
+    eval "./vzic/vzic --olson-dir tzdata --output-dir build/zoneinfo $VZIC_INVOCATION_ARGS"
+
+    export VZIC_ZONEINFO_NEW=`pwd`/build/zoneinfo
+
+    if [[ -d zoneinfo ]]; then
+        export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
+
+        echo "Merging..."
+        ./vzic/vzic-merge.pl
+
+        # copy updated zones
+        cp -r $VZIC_ZONEINFO_NEW/zones.* $VZIC_ZONEINFO_MASTER 
+
+    else
+        cp -r "$VZIC_ZONEINFO_NEW" zoneinfo
+        export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
+        echo "No master zoneinfo configured. The new zoneinfo will not be merged and kept as is."
+    fi
+
+    echo "Creating output archive"
+    VZIC_OUT_TAR="`pwd`/build/out/zoneinfo-$VZIC_RELEASE_NAME.tar.gz"
+    pushd $VZIC_ZONEINFO_MASTER
+    tar -czf "$VZIC_OUT_TAR" * 
+    popd
+
+    echo $VZIC_RELEASE_NAME > tzdb_version.txt
+
+    git add .
 
-echo "Creating output archive"
-VZIC_OUT_TAR="`pwd`/build/out/zoneinfo-$VZIC_RELEASE_NAME.tar.gz"
-pushd $VZIC_ZONEINFO_MASTER
-tar -czf "$VZIC_OUT_TAR" * 
-popd
+    git commit -m "Update zoneinfo to $VZIC_RELEASE_NAME"
+done
diff --git a/settings.config b/settings.config
@@ -1,8 +1,7 @@
 
-VZIC_RELEASE_NAME=2024a
-
 # The source tzdata is downloaded from this URL.
-VZIC_TZDATA_ARCHIVE_URL="https://data.iana.org/time-zones/releases/tzdata$VZIC_RELEASE_NAME.tar.gz"
+VZIC_TAG_PREFIX="release_"
+VZIC_TZDB_RELEASES_URL="https://data.iana.org/time-zones/releases/"
 
 VZIC_PRODID="-//github.com/libical/vzic//NONSGML ICS//EN"
 VZIC_TZID_PREFIX="/github.com/libical/tzdbics/%D_$VZIC_RELEASE_NAME/"
diff --git a/tzdb_version.txt b/tzdb_version.txt
@@ -0,0 +1 @@
+2024a
diff --git a/vzic b/vzic
@@ -0,0 +1 @@
+Subproject commit 02a942d1c56bbaab48e9922874c0627d31bb43c8
diff --git a/vzic-merge.pl b/vzic-merge.pl

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "vzic"]`
	`2`	`+ path = vzic`
	`3`	`+ url = https://github.com/libical/vzic`