Skip to content

fix: pickup zig version from the package #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
psadi merged 1 commit into from
Mar 10, 2026
Merged

fix: pickup zig version from the package #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,7 @@ jobs:
- name: Setup build environment
run: |
if [ "${{ github.event_name }}" == "schedule" ]; then
ZIG_VERSION=0.15.2
echo "tip" > VERSION
else
ZIG_VERSION=0.14.0
fi
ZIG_VERSION=$ZIG_VERSION ./bin/setup-env.sh
./bin/setup-env.sh
- name: Build Ghostty
run: |
Expand Down
17 changes: 17 additions & 0 deletions bin/build-ghostty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,23 @@ rm "ghostty-${GHOSTTY_VERSION}.tar.gz" \

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

# Configure Zig: https://ziglang.org
ZIG_VERSION="$(cat "ghostty-${GHOSTTY_VERSION}/build.zig.zon" | grep ".minimum_zig_version" | cut -d'"' -f2)"
CURRENT_ZIG_VERSION=$(zig version 2>/dev/null || true)
if [ "$CURRENT_ZIG_VERSION" != "$ZIG_VERSION" ]; then
echo "Installing Zig ${ZIG_VERSION}..."
ZIG_PACKAGE_NAME="zig-${ARCH}-linux-${ZIG_VERSION}"
ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/${ZIG_PACKAGE_NAME}.tar.xz"
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_PACKAGE_NAME}/zig" /usr/local/bin/zig
echo "Zig ${ZIG_VERSION} installed successfully"
else
echo "Zig ${ZIG_VERSION} is already installed, skipping installation"
fi

(
cd "ghostty-${GHOSTTY_VERSION}"
ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/fetch-zig-cache.sh
Expand Down
17 changes: 0 additions & 17 deletions bin/setup-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,13 @@ pacman -Syuq --needed --noconfirm --noprogressbar ${buildDeps} ${ghosttyDeps}

ARCH="$(uname -m)"

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

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

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

ZIG_PACKAGE_NAME="zig-linux-${ARCH}-${ZIG_VERSION}"

if [ "${ZIG_VERSION}" != "0.14.0" ]; then
ZIG_PACKAGE_NAME="zig-${ARCH}-linux-${ZIG_VERSION}"
fi

ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/${ZIG_PACKAGE_NAME}.tar.xz"

DEBLOATED_PKGS="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
SHARUN="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"

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

# Download & install other dependencies
# zig: https://ziglang.org
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_PACKAGE_NAME}/zig" /usr/local/bin/zig

# minisign: https://github.com/jedisct1/minisign
rm -rf /usr/local/bin/minisign
wget "${MINISIGN_URL}" -O /tmp/minisign-linux.tar.gz
Expand Down