Merge pull request #68 from psadi/feature/ci_changes

ci: handle zig versions for stable and nightly builds

Author: psadi

.github/workflows/ci.yaml

@@ -33,7 +33,7 @@ jobs:
             platform: linux/amd64
             runs-on: ubuntu-24.04
     container:
-      image: ghcr.io/psadi/ghostty-appimage:latest
+      image: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
       - name: Checkout ghostty-appimage
         uses: actions/checkout@v4
@@ -45,12 +45,24 @@ jobs:
         uses: actions/cache@v4
         with:
           path: |
+            /var/cache/pacman
             /tmp/offline-cache
             /root/.cache/zig
           key: ${{ runner.os }}-${{ matrix.arch }}-ghostty-${{ hashFiles('**/VERSION') }}
           restore-keys: |
             ${{ runner.os }}-${{ matrix.arch }}-ghostty-
 
+      - name: Setup build environment
+        run: |
+          if [ "${{ github.event_name }}" == "schedule" ]; then
+            ZIG_VERSION=0.14.0
+          else
+            ZIG_VERSION=0.13.0
+          fi
+
+          sed -i "s/#ZIG_VERSION/${ZIG_VERSION}/g" setup.sh
+          ./setup.sh
+
       - name: Build Ghostty AppImage
         run: |
           if [ "${{ github.event_name }}" == "schedule" ]; then

.github/workflows/image.yaml

@@ -12,11 +12,12 @@ get_latest_gh_release() {
 # Update & install OS base dependencies
 buildDeps="base-devel freetype2 oniguruma wget mesa file zsync appstream xorg-server-xvfb patchelf binutils strace git jq"
 ghosttyDeps="gtk4 libadwaita blueprint-compiler gtk4-layer-shell"
+rm -rf "/usr/share/libalpm/hooks/package-cleanup.hook"
 pacman -Syuq --needed --noconfirm --noprogressbar ${buildDeps} ${ghosttyDeps}
 
 export ARCH="$(uname -m)"
 
-ZIG_VERSION="0.13.0"
+ZIG_VERSION="#ZIG_VERSION"
 PANDOC_VERSION="$(get_latest_gh_release 'jgm/pandoc')"
 MINISIGN_VERSION="$(get_latest_gh_release 'jedisct1/minisign')"
 SHARUN_VERSION="$(get_latest_gh_release 'VHSgunzo/sharun')"
@@ -55,13 +56,11 @@ pacman -U --noconfirm /tmp/llvm-libs.pkg.tar.zst /tmp/libxml2.pkg.tar.zst
 
 # Download & install other dependencies
 # zig: https://ziglang.org
-if [ ! -d "/opt/zig-linux-${ARCH}-${ZIG_VERSION}" ]; then
-	rm -rf /opt/zig*
-	unlink /usr/local/bin/zig || true
-	wget "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
-	tar -xJf /tmp/zig-linux.tar.xz -C /opt
-	ln -s "/opt/zig-linux-${ARCH}-${ZIG_VERSION}/zig" /usr/local/bin/zig
-fi
+rm -rf /opt/zig*
+unlink /usr/local/bin/zig || true
+wget "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
+tar -xJf /tmp/zig-linux.tar.xz -C /opt
+ln -s "/opt/zig-linux-${ARCH}-${ZIG_VERSION}/zig" /usr/local/bin/zig
 
 # appimagetool: https://github.com/AppImage/appimagetool
 rm -rf /usr/local/bin/appimagetool