Skip to content

Commit 2b458ba

Browse files
psadipsadi
andauthored
fix: pickup zig version from the package (#129)
Co-authored-by: psadi <mail@adithyaps.xyz>
1 parent 06226bc commit 2b458ba

3 files changed

Lines changed: 18 additions & 24 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,7 @@ jobs:
5454
5555
- name: Setup build environment
5656
run: |
57-
if [ "${{ github.event_name }}" == "schedule" ]; then
58-
ZIG_VERSION=0.15.2
59-
echo "tip" > VERSION
60-
else
61-
ZIG_VERSION=0.14.0
62-
fi
63-
ZIG_VERSION=$ZIG_VERSION ./bin/setup-env.sh
57+
./bin/setup-env.sh
6458
6559
- name: Build Ghostty
6660
run: |

bin/build-ghostty.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ rm "ghostty-${GHOSTTY_VERSION}.tar.gz" \
4040

4141
BUILD_ARGS="${BUILD_ARGS} -Dversion-string=${GHOSTTY_VERSION}"
4242

43+
# Configure Zig: https://ziglang.org
44+
ZIG_VERSION="$(cat "ghostty-${GHOSTTY_VERSION}/build.zig.zon" | grep ".minimum_zig_version" | cut -d'"' -f2)"
45+
CURRENT_ZIG_VERSION=$(zig version 2>/dev/null || true)
46+
if [ "$CURRENT_ZIG_VERSION" != "$ZIG_VERSION" ]; then
47+
echo "Installing Zig ${ZIG_VERSION}..."
48+
ZIG_PACKAGE_NAME="zig-${ARCH}-linux-${ZIG_VERSION}"
49+
ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/${ZIG_PACKAGE_NAME}.tar.xz"
50+
rm -rf /opt/zig*
51+
unlink /usr/local/bin/zig || true
52+
wget "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
53+
tar -xJf /tmp/zig-linux.tar.xz -C /opt
54+
ln -s "/opt/${ZIG_PACKAGE_NAME}/zig" /usr/local/bin/zig
55+
echo "Zig ${ZIG_VERSION} installed successfully"
56+
else
57+
echo "Zig ${ZIG_VERSION} is already installed, skipping installation"
58+
fi
59+
4360
(
4461
cd "ghostty-${GHOSTTY_VERSION}"
4562
ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/fetch-zig-cache.sh

bin/setup-env.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,13 @@ pacman -Syuq --needed --noconfirm --noprogressbar ${buildDeps} ${ghosttyDeps}
1616

1717
ARCH="$(uname -m)"
1818

19-
ZIG_VERSION="${ZIG_VERSION:-0.14.0}"
2019
MINISIGN_VERSION="$(get_latest_gh_release 'jedisct1/minisign')"
2120

2221
GH_BASE="https://github.com"
2322
GH_USER_CONTENT="https://raw.githubusercontent.com"
2423

2524
MINISIGN_URL="${GH_BASE}/jedisct1/minisign/releases/download/${MINISIGN_VERSION}/minisign-${MINISIGN_VERSION}-linux.tar.gz"
2625

27-
ZIG_PACKAGE_NAME="zig-linux-${ARCH}-${ZIG_VERSION}"
28-
29-
if [ "${ZIG_VERSION}" != "0.14.0" ]; then
30-
ZIG_PACKAGE_NAME="zig-${ARCH}-linux-${ZIG_VERSION}"
31-
fi
32-
33-
ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/${ZIG_PACKAGE_NAME}.tar.xz"
34-
3526
DEBLOATED_PKGS="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
3627
SHARUN="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"
3728

@@ -40,14 +31,6 @@ wget "${DEBLOATED_PKGS}" -O /tmp/get-debloated-pkgs.sh
4031
chmod a+x /tmp/get-debloated-pkgs.sh
4132
sh /tmp/get-debloated-pkgs.sh --add-opengl --prefer-nano gtk4-mini libxml2-mini gdk-pixbuf2-mini librsvg-mini
4233

43-
# Download & install other dependencies
44-
# zig: https://ziglang.org
45-
rm -rf /opt/zig*
46-
unlink /usr/local/bin/zig || true
47-
wget "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
48-
tar -xJf /tmp/zig-linux.tar.xz -C /opt
49-
ln -s "/opt/${ZIG_PACKAGE_NAME}/zig" /usr/local/bin/zig
50-
5134
# minisign: https://github.com/jedisct1/minisign
5235
rm -rf /usr/local/bin/minisign
5336
wget "${MINISIGN_URL}" -O /tmp/minisign-linux.tar.gz

0 commit comments

Comments
 (0)