[pull] main from pkgforge-dev:main

.github/workflows/ci.yaml

@@ -36,7 +36,7 @@ jobs:
       image: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
       - name: Checkout ghostty-appimage
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           persist-credentials: false
 
@@ -55,27 +55,24 @@ jobs:
       - name: Setup build environment
         run: |
           if [ "${{ github.event_name }}" == "schedule" ]; then
-            ZIG_VERSION=0.14.0
-          else
-            ZIG_VERSION=0.13.0
+            echo "tip" > VERSION
           fi
+          ./bin/setup-env.sh
 
-          sed -i "s/#ZIG_VERSION/${ZIG_VERSION}/g" setup.sh
-          ./setup.sh
+      - name: Build Ghostty
+        run: |
+          ./bin/build-ghostty.sh
 
-      - name: Build Ghostty AppImage
+      - name: Bundle AppImage
         run: |
-          if [ "${{ github.event_name }}" == "schedule" ]; then
-            echo "tip" > VERSION
-          fi
-          ./build.sh
+          ./bin/bundle-appimage.sh
 
       - name: Upload AppImage Artifacts
         uses: actions/upload-artifact@v4
         with:
           name: ghostty-appimage-${{ matrix.arch }}
           retention-days: 7
-          path: /tmp/ghostty-build/Ghostty-*-${{ matrix.arch }}.AppImage*
+          path: dist
 
   tag:
     name: "👻 Tip Tag"
@@ -88,12 +85,23 @@ jobs:
     needs:
       - build_appimage
     steps:
-      - uses: actions/checkout@v4 # zizmor: ignore[artipacked]
-      - name: Tip Tag
+      - uses: actions/checkout@v5 # zizmor: ignore[artipacked]
+
+      - name: Clean-up Old Release Assets
+        run: |
+          gh release view tip --json assets --jq '.assets[].name' | while read -r asset; do
+            if [ -n "$asset" ]; then
+              gh release delete-asset tip "${asset}" -y
+            fi
+          done
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+      - name: Create 'tip' tag
         run: |
           git config user.name "github-actions[bot]"
           git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git tag -fa tip -m "Latest Continuous Release" ${GITHUB_SHA}
+          git tag -fa tip -m "Latest Continuous Release" "${GITHUB_SHA}"
           git push --force origin tip
 
   release_stable:
@@ -106,11 +114,11 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'release' }}
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: ghostty-appimage-aarch64
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: ghostty-appimage-x86_64
 
@@ -134,16 +142,16 @@ jobs:
       contents: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: ghostty-appimage-aarch64
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v6
         with:
           name: ghostty-appimage-x86_64
 
       - name: Ghostty Tip ("Nightly")
-        uses: softprops/action-gh-release@v2.2.1
+        uses: softprops/action-gh-release@v3.0.0
         with:
           name: '👻 Ghostty Tip ("Nightly")'
           prerelease: true

.gitignore

@@ -20,3 +20,10 @@ Sessionx.vim
 tags
 # Persistent undo
 [._]*.un~
+
+AppDir
+ghostty-*
+quick-sharun
+uruntime2appimage
+dist
+appinfo

README.md

@@ -34,7 +34,7 @@ Run the following commands in your terminal:
 
 ```bash
 # Download the latest AppImage package from releases
-wget https://github.com/pkgforge-dev/ghostty-appimage/releases/download/${VERSION}/Ghostty-${VERSION}-${ARCH}.AppImage
+wget https://github.com/pkgforge-dev/ghostty-appimage/releases/download/v${VERSION}/Ghostty-${VERSION}-${ARCH}.AppImage
 
 # Make the AppImage executable
 chmod +x Ghostty-${VERSION}-${ARCH}.AppImage
@@ -110,25 +110,26 @@ _Note: Ensure you have the necessary permissions to run these commands. For more
 <details>
   <summary><b>Graphical (Automatic)</b></summary>
 
-Ghostty AppImage can easily be managed using graphical tools such as [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) and [Gear Lever](https://github.com/mijorus/gearlever).
+Ghostty AppImage can easily be managed using graphical tools such as [AppManager](https://github.com/kem-a/AppManager) and [Gear Lever](https://github.com/mijorus/gearlever).
 
-1. **Using [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher)**
-
-   For detailed instructions, please refer to the [AppImageLauncher documentation](https://docs.appimage.org/user-guide/run-appimages.html#appimagelauncher).
-
-   > **🛈 NOTE**
-   >
-   > With the launch of AppImageLauncher **v3.0.0**, you have to use the alpha pre-releases as the stable release doesn't work with the static runtime
-   >
-   > For more information please refer the [discussion](https://github.com/TheAssassin/AppImageLauncher/discussions/687) and the [comment](https://github.com/TheAssassin/AppImageLauncher/discussions/687#discussioncomment-12181060)
+1. **Using [AppManager](https://github.com/kem-a/AppManager)**
+   - Download the latest AppImage package from the [releases](https://github.com/pkgforge-dev/ghostty-appimage/releases) section.
+   - Simply drag and drop the files from your file manager into the AppManager application.
+   - Follow the on-screen instructions to configure the setup as a one-time installation process.
 
 2. **Using [Gear Lever](https://github.com/mijorus/gearlever)**
-
    - Download the latest AppImage package from the [releases](https://github.com/pkgforge-dev/ghostty-appimage/releases) section.
    - Simply drag and drop the files from your file manager into the Gear Lever application.
    - Follow the on-screen instructions to configure the setup as a one-time installation process.
 
-_Note: Ensure the necessary prerequsites are satisfied for these applications. For more detailed usage, refer to the documentation of each tool_
+> **🛈 NOTE**
+> Ensure the necessary prerequsites are satisfied for these applications. For more detailed usage, refer to the documentation of each tool
+
+> **🛈 NOTE**
+  Gearlever does not support delta updates with zsync and you may need to give it the URL to update manually.
+
+> **🛈 NOTE**
+  Gearlever does not have official AppImage releases. You can use [this one](https://github.com/pkgforge-dev/Gear-Lever-AppImage) however.
 
    </details>
 
@@ -152,10 +153,6 @@ Since AppImages are self-contained executables, there is no formal installation
 
 </details>
 
-## 🛠️ Troubleshooting
-
-Refer [TROUBLESHOOTING.md](./TROUBLESHOOTING.md) file
-
 ## 🤝 Contributing
 
 Contributions & Bugfixes are welcome. If you like to contribute, please feel free to fork the repository and submit a pull request.

VERSION

@@ -1 +1 @@
-1.1.3
+1.3.1

bin/build-ghostty.sh

@@ -0,0 +1,64 @@
+#!/bin/sh
+
+set -eux
+
+ARCH="$(uname -m)"
+GHOSTTY_VERSION="$(cat VERSION)"
+PUB_KEY="RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV"
+
+rm -rf AppDir dist ghostty-*
+
+BUILD_ARGS="
+	-Dcpu=baseline \
+	-Doptimize=ReleaseFast \
+	-Dpie=true \
+    --system /tmp/offline-cache/p \
+    -Dgtk-wayland=true \
+    -Dgtk-x11=true \
+    -Demit-docs=false \
+    -Dstrip=true"
+
+if [ "${GHOSTTY_VERSION}" = "tip" ]; then
+	export UPINFO="gh-releases-zsync|$(echo "${GITHUB_REPOSITORY}" | tr '/' '|')|tip|Ghostty-*$ARCH.AppImage.zsync"
+	wget "https://github.com/ghostty-org/ghostty/releases/download/tip/ghostty-source.tar.gz" -O "ghostty-${GHOSTTY_VERSION}.tar.gz"
+	wget "https://github.com/ghostty-org/ghostty/releases/download/tip/ghostty-source.tar.gz.minisig" -O "ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
+	GHOSTTY_VERSION="$(tar -tf "ghostty-${GHOSTTY_VERSION}.tar.gz" --wildcards "*zig.zon.txt" | awk -F'[-/]' '{print $2"-"$3}')"
+	echo "${GHOSTTY_VERSION}" >VERSION
+	mv ghostty-tip.tar.gz "ghostty-${GHOSTTY_VERSION}.tar.gz"
+	mv ghostty-tip.tar.gz.minisig "ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
+else
+	wget "https://release.files.ghostty.org/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz"
+	wget "https://release.files.ghostty.org/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
+fi
+
+minisign -V -m "ghostty-${GHOSTTY_VERSION}.tar.gz" -P "${PUB_KEY}" -s "ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
+
+tar -xzmf "ghostty-${GHOSTTY_VERSION}.tar.gz"
+
+rm "ghostty-${GHOSTTY_VERSION}.tar.gz" \
+	"ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
+
+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
+	zig build ${BUILD_ARGS}
+)

bin/bundle-appimage.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -eux
+
+ARCH="$(uname -m)"
+GHOSTTY_VERSION="$(cat VERSION)"
+
+export UPINFO="gh-releases-zsync|$(echo "${GITHUB_REPOSITORY}" | tr '/' '|')|latest|Ghostty-*$ARCH.AppImage.zsync"
+export URUNTIME_PRELOAD=1
+export DEPLOY_OPENGL=1
+export EXEC_WRAPPER=1
+export OUTNAME="Ghostty-${GHOSTTY_VERSION}-${ARCH}.AppImage"
+export DESKTOP="./ghostty-${GHOSTTY_VERSION}/zig-out/share/applications/com.mitchellh.ghostty.desktop"
+export ICON="./ghostty-${GHOSTTY_VERSION}/zig-out/share/icons/hicolor/256x256/apps/com.mitchellh.ghostty.png"
+
+./quick-sharun ./ghostty-${GHOSTTY_VERSION}/zig-out/bin/ghostty
+cp -rf ./ghostty-${GHOSTTY_VERSION}/zig-out/share/* ./AppDir/share/
+./quick-sharun --make-appimage
+
+mkdir -p ./dist
+mv -v ./*.AppImage* ./dist