Use vzic-merge.pl from the vzic project rather than maintaining a local copy and include as submodule.

minichma · minichma · commit 7d3a4df81652 · 2025-03-19T22:08:57.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,13 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-
     - uses: actions/checkout@v3
       with:
-        repository: libical/vzic
-        ref: a4e030343e015d268fc26fad4365b6061a17791d
-        path: build/vzic
+        submodules: true
 
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y libglib2.0-dev
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/build.sh b/build.sh
@@ -50,7 +50,7 @@ if [[ -d zoneinfo ]]; then
     export VZIC_ZONEINFO_MASTER=`pwd`/zoneinfo
 
     echo "Merging..."
-    ./vzic-merge.pl
+    ./build/vzic/vzic-merge.pl
 
     # copy updated zones
     cp -r $VZIC_ZONEINFO_NEW/zones.* $VZIC_ZONEINFO_MASTER 
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`