Merge pull request #84 from pkgforge-dev/feature/glfw

sunset glfw builds

Author: psadi

.github/workflows/ci.yaml

@@ -21,27 +21,17 @@ jobs:
       actions: read
       security-events: write
       contents: write
-    name: 👻 Build Ghostty (${{ matrix.arch }}) ${{ matrix.glfw == true && '(glfw)' || '' }}
+    name: 👻 Build Ghostty (${{ matrix.arch }})
     runs-on: ${{ matrix.runs-on }}
     strategy:
       matrix:
         include:
           - arch: aarch64
             platform: linux/arm64
             runs-on: ubuntu-24.04-arm
-            glfw: false
           - arch: x86_64
             platform: linux/amd64
             runs-on: ubuntu-24.04
-            glfw: false
-          - arch: aarch64
-            platform: linux/arm64
-            runs-on: ubuntu-24.04-arm
-            glfw: true
-          - arch: x86_64
-            platform: linux/amd64
-            runs-on: ubuntu-24.04
-            glfw: true
     container:
       image: ghcr.io/pkgforge-dev/archlinux:latest
     steps:
@@ -78,13 +68,11 @@ jobs:
             echo "tip" > VERSION
           fi
           ./build.sh
-        env:
-          GLFW: ${{ matrix.glfw }}
 
       - name: Upload AppImage Artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: ghostty-appimage-${{ matrix.arch }}${{ matrix.glfw == true && '-glfw' || '' }}
+          name: ghostty-appimage-${{ matrix.arch }}
           retention-days: 7
           path: /tmp/ghostty-build/Ghostty*-${{ matrix.arch }}.AppImage*
 
@@ -136,14 +124,6 @@ jobs:
         with:
           name: ghostty-appimage-x86_64
 
-      - uses: actions/download-artifact@v4
-        with:
-          name: ghostty-appimage-aarch64-glfw
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: ghostty-appimage-x86_64-glfw
-
       - name: Ghostty stable
         uses: svenstaro/upload-release-action@v2
         with:
@@ -172,14 +152,6 @@ jobs:
         with:
           name: ghostty-appimage-x86_64
 
-      - uses: actions/download-artifact@v4
-        with:
-          name: ghostty-appimage-aarch64-glfw
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: ghostty-appimage-x86_64-glfw
-
       - name: Ghostty Tip ("Nightly")
         uses: softprops/[email protected]
         with:

README.md

@@ -25,21 +25,6 @@ This repository provides build scripts to create a Universal AppImage for [Ghost
 1. Stable builds are based on upstream releases, with minor fixes and patches released as **version+1** tag(s).
 1. Daily nightly builds, based on the upstream [tip releases](https://github.com/ghostty-org/ghostty/releases/tag/tip), are built and released at **00:00 UTC every day** and are available as pre-releases in the [releases](https://github.com/pkgforge-dev/ghostty-appimage/releases/tag/tip) section.
 
-## 🧪 Experimental Builds (GLFW)
-
-> [!WARNING]
->
-> Please read the following carefully before using them
->
-> - These builds are available for both stable and daily nightly releases
-> - These builds use the experimental flag `-Dapp-runtime=glfw`
-> - They do not include bundled dependencies for Gtk and libadwaita
-> - Window decorations may not work on non-GNOME desktop environments (No CSD)
-> - Tabs and splits are not functional
-> - The terminal inspector does not work
-> - The build size is drastically reduced (around 20 MB) as 80+ dependencies are not bundled
-> - Please refer to the [**upstream warning notice**](https://github.com/ghostty-org/ghostty/blob/main/PACKAGING.md#build-options) for further info
-
 ## ⚙️ Installation
 
 <details>
@@ -138,7 +123,6 @@ Ghostty AppImage can easily be managed using graphical tools such as [AppImageLa
    > 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)
 
 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.

build.sh

@@ -10,7 +10,7 @@ PUB_KEY="RWQlAjJC23149WL2sEpT/l0QKy7hMIFhYdQOFy0Z7z7PbneUgvlsnYcV"
 UPINFO="gh-releases-zsync|$(echo "${GITHUB_REPOSITORY}" | tr '/' '|')|latest|Ghostty-*$ARCH.AppImage.zsync"
 APPDATA_FILE="${PWD}/assets/ghostty.appdata.xml"
 DESKTOP_FILE="${PWD}/assets/ghostty.desktop"
-LIBS2BUNDLE="./bin/ghostty /usr/lib/libEGL*"
+LIBS2BUNDLE="./bin/ghostty /usr/lib/libEGL* /usr/lib/gdk-pixbuf-*/*/*/*"
 BUILD_ARGS="
 	--summary all \
 	--prefix ${APP_DIR} \
@@ -38,12 +38,6 @@ else
 	wget "https://release.files.ghostty.org/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz.minisig"
 fi
 
-if [ "${GLFW}" = true ]; then
-	BUILD_ARGS="${BUILD_ARGS} -Dapp-runtime=glfw"
-else
-	LIBS2BUNDLE="${LIBS2BUNDLE} /usr/lib/gdk-pixbuf-*/*/*/*"
-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"
@@ -81,14 +75,12 @@ xvfb-run -a -- sharun l -p -v -e -s -k ${LIBS2BUNDLE}
 
 # preload libpixbufloader /w ld-preload-open as svg icons breaks
 # either on ghostty tab bar or gnome-text-editor while config edit or both :(
-if [ "${GLFW}" = false ]; then
-	mv ./shared/lib/gdk-pixbuf-2.0 ./
-	cp -rv /opt/path-mapping.so ./shared/lib/
-	cp -rv gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.so ./shared/lib/
+mv ./shared/lib/gdk-pixbuf-2.0 ./
+cp -rv /opt/path-mapping.so ./shared/lib/
+cp -rv gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader_svg.so ./shared/lib/
 
-	echo 'path-mapping.so' >./.preload
-	echo 'PATH_MAPPING=/usr/lib/gdk-pixbuf-2.0:${SHARUN_DIR}/gdk-pixbuf-2.0' >>./.env
-fi
+echo 'path-mapping.so' >./.preload
+echo 'PATH_MAPPING=/usr/lib/gdk-pixbuf-2.0:${SHARUN_DIR}/gdk-pixbuf-2.0' >>./.env
 
 echo 'GHOSTTY_RESOURCES_DIR=${SHARUN_DIR}/share/ghostty' >>./.env
 echo 'unset ARGV0' >>./.env
@@ -104,11 +96,6 @@ fi
 
 GHOSTTY_APPIMAGE="Ghostty-${VERSION}-${ARCH}.AppImage"
 
-if [ "${GLFW}" = true ]; then
-	UPINFO="gh-releases-zsync|$(echo "${GITHUB_REPOSITORY:-no-user/no-repo}" | tr '/' '|')|latest|Ghostty_*$ARCH.AppImage.zsync"
-	GHOSTTY_APPIMAGE="Ghostty_Glfw-${VERSION}-${ARCH}.AppImage"
-fi
-
 cd "${TMP_DIR}"
 
 # create app image