Revert "Merge branch 'main' into dynamic-highway"

This reverts commit 4547aa8, reversing
changes made to 5184ff5.

Author: AnthonyZhOon

.gitattributes

@@ -1,6 +1,6 @@
 build.zig.zon.nix linguist-generated=true
 build.zig.zon.txt linguist-generated=true
-build.zig.zon.json linguist-generated=true
+build.zig.zon2json-lock linguist-generated=true
 vendor/** linguist-vendored
 website/** linguist-documentation
 pkg/breakpad/vendor/** linguist-vendored

.github/workflows/release-tag.yml

@@ -77,18 +77,9 @@ jobs:
     needs: [setup]
     env:
       GHOSTTY_VERSION: ${{ needs.setup.outputs.version }}
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
     steps:
       - uses: actions/checkout@v4
 
-      - name: Setup Cache
-        uses: namespacelabs/[email protected]
-        with:
-          path: |
-            /nix
-            /zig
-
       - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
@@ -100,8 +91,8 @@ jobs:
 
       - name: Create Tarball
         run: |
-          nix develop -c zig build distcheck
-          cp zig-out/dist/ghostty-${GHOSTTY_VERSION}.tar.gz .
+          git archive --format=tgz --prefix="ghostty-${GHOSTTY_VERSION}/" -o "ghostty-${GHOSTTY_VERSION}.tar.gz" HEAD
+          git archive --format=tgz --prefix=ghostty-source/ -o ghostty-source.tar.gz HEAD
 
       - name: Sign Tarball
         run: |
@@ -117,6 +108,8 @@ jobs:
           path: |-
             ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz
             ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz.minisig
+            ghostty-source.tar.gz
+            ghostty-source.tar.gz.minisig
 
   build-macos:
     needs: [setup]

.github/workflows/release-tip.yml

@@ -101,17 +101,8 @@ jobs:
         )
       }}
     runs-on: namespace-profile-ghostty-md
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Cache
-        uses: namespacelabs/[email protected]
-        with:
-          path: |
-            /nix
-            /zig
       - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=channel:nixos-unstable
@@ -120,17 +111,12 @@ jobs:
           name: ghostty
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
       - name: Create Tarball
-        run: |
-          rm -rf zig-out/dist
-          nix develop -c zig build distcheck
-          cp zig-out/dist/*.tar.gz ghostty-source.tar.gz
-
+        run: git archive --format=tgz --prefix=ghostty-source/ -o ghostty-source.tar.gz HEAD
       - name: Sign Tarball
         run: |
           echo -n "${{ secrets.MINISIGN_KEY }}" > minisign.key
           echo -n "${{ secrets.MINISIGN_PASSWORD }}" > minisign.password
           nix develop -c minisign -S -m ghostty-source.tar.gz -s minisign.key < minisign.password
-
       - name: Update Release
         uses: softprops/action-gh-release@v2
         with:

.github/workflows/test.yml

@@ -8,11 +8,9 @@ name: Test
 jobs:
   required:
     name: "Required Checks: Test"
-    runs-on: namespace-profile-ghostty-xsm
+    runs-on: namespace-profile-ghostty-sm
     needs:
       - build-bench
-      - build-dist
-      - build-flatpak
       - build-linux
       - build-linux-libghostty
       - build-nix
@@ -29,10 +27,8 @@ jobs:
       - alejandra
       - typos
       - translations
-      - blueprint-compiler
       - test-pkg-linux
       - test-debian-12
-      - zig-fmt
     steps:
       - id: status
         name: Determine status
@@ -83,40 +79,6 @@ jobs:
       - name: Build Benchmarks
         run: nix develop -c zig build -Dapp-runtime=glfw -Demit-bench
 
-  build-flatpak:
-    strategy:
-      fail-fast: false
-    runs-on: namespace-profile-ghostty-sm
-    needs: test
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Cache
-        uses: namespacelabs/[email protected]
-        with:
-          path: |
-            /nix
-            /zig
-
-      # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
-        with:
-          name: ghostty
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Build with Flatpak
-        run: |
-          nix develop -c \
-            zig build \
-            -Dflatpak=true
-
   build-linux:
     strategy:
       fail-fast: false
@@ -212,35 +174,6 @@ jobs:
       - name: Test NixOS package build
         run: nix build .#ghostty
 
-  build-dist:
-    runs-on: namespace-profile-ghostty-md
-    needs: test
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Cache
-        uses: namespacelabs/[email protected]
-        with:
-          path: |
-            /nix
-            /zig
-
-      # Install Nix and use that to run our tests so our environment matches exactly.
-      - uses: cachix/install-nix-action@v30
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
-        with:
-          name: ghostty
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-
-      - name: Build and Check Source Tarball
-        run: nix develop -c zig build distcheck
-
   build-macos:
     runs-on: namespace-profile-ghostty-macos
     needs: test
@@ -614,36 +547,9 @@ jobs:
       - name: test
         run: nix develop -c zig build test --system ${{ steps.deps.outputs.deps }}
 
-  zig-fmt:
-    if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-xsm
-    timeout-minutes: 60
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
-    steps:
-      - uses: actions/checkout@v4 # Check out repo so we can lint it
-      - name: Setup Cache
-        uses: namespacelabs/[email protected]
-        with:
-          path: |
-            /nix
-            /zig
-      - uses: cachix/install-nix-action@v30
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
-        with:
-          name: ghostty
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-          skipPush: true
-          useDaemon: false # sometimes fails on short jobs
-      - name: zig fmt
-        run: nix develop -c zig fmt --check .
-
   prettier:
     if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-xsm
+    runs-on: namespace-profile-ghostty-sm
     timeout-minutes: 60
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
@@ -670,7 +576,7 @@ jobs:
 
   alejandra:
     if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-xsm
+    runs-on: namespace-profile-ghostty-sm
     timeout-minutes: 60
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
@@ -697,7 +603,7 @@ jobs:
 
   typos:
     if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-xsm
+    runs-on: namespace-profile-ghostty-sm
     timeout-minutes: 60
     env:
       ZIG_LOCAL_CACHE_DIR: /zig/local-cache
@@ -756,39 +662,7 @@ jobs:
           msgcmp "$old_pot" po/com.mitchellh.ghostty.pot --use-untranslated
 
           # Compare all other POs to current POT
-          for f in po/*.po; do
-            # Ignore untranslated entries
-            msgcmp --use-untranslated "$f" po/com.mitchellh.ghostty.pot;
-          done
-
-  blueprint-compiler:
-    if: github.repository == 'ghostty-org/ghostty'
-    runs-on: namespace-profile-ghostty-sm
-    timeout-minutes: 60
-    env:
-      ZIG_LOCAL_CACHE_DIR: /zig/local-cache
-      ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
-    steps:
-      - uses: actions/checkout@v4 # Check out repo so we can lint it
-      - name: Setup Cache
-        uses: namespacelabs/[email protected]
-        with:
-          path: |
-            /nix
-            /zig
-      - uses: cachix/install-nix-action@v30
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-      - uses: cachix/cachix-action@v15
-        with:
-          name: ghostty
-          authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
-          skipPush: true
-          useDaemon: false # sometimes fails on short jobs
-      - name: check blueprints
-        run: nix develop -c ./nix/build-support/check-blueprints.sh
-      - name: check unchanged
-        run: git diff --exit-code
+          for f in po/*.po; do msgcmp "$f" po/com.mitchellh.ghostty.pot; done
 
   test-pkg-linux:
     strategy:
@@ -846,3 +720,4 @@ jobs:
           file: src/build/docker/debian/Dockerfile
           build-args: |
             DISTRO_VERSION=12
+            ZIG_VERSION=0.14.0

.github/workflows/update-colorschemes.yml

@@ -66,9 +66,9 @@ jobs:
           commit-message: "deps: Update iTerm2 color schemes"
           add-paths: |
             build.zig.zon
+            build.zig.zon2json-lock
             build.zig.zon.nix
             build.zig.zon.txt
-            build.zig.zon.json
           body: |
             Upstream revision: https://github.com/mbadolato/iTerm2-Color-Schemes/tree/${{ steps.zig_fetch.outputs.upstream_rev }}
           labels: dependencies

CODEOWNERS

@@ -159,7 +159,6 @@
 /po/README_TRANSLATORS.md @ghostty-org/localization
 /po/com.mitchellh.ghostty.pot @ghostty-org/localization
 /po/de_DE.UTF-8.po @ghostty-org/de_DE
-/po/nb_NO.UTF-8.po @ghostty-org/nb_NO
 /po/zh_CN.UTF-8.po @ghostty-org/zh_CN
 
 # Packaging - Snap

build.zig

@@ -15,31 +15,25 @@ pub fn build(b: *std.Build) !void {
 
     // Ghostty dependencies used by many artifacts.
     const deps = try buildpkg.SharedDeps.init(b, &config);
-    if (config.emit_helpgen) deps.help_strings.install();
-
-    // Ghostty executable, the actual runnable Ghostty program.
     const exe = try buildpkg.GhosttyExe.init(b, &config, &deps);
+    if (config.emit_helpgen) deps.help_strings.install();
 
     // Ghostty docs
-    const docs = try buildpkg.GhosttyDocs.init(b, &deps);
-    if (config.emit_docs) docs.install();
+    if (config.emit_docs) {
+        const docs = try buildpkg.GhosttyDocs.init(b, &deps);
+        docs.install();
+    }
 
     // Ghostty webdata
-    const webdata = try buildpkg.GhosttyWebdata.init(b, &deps);
-    if (config.emit_webdata) webdata.install();
+    if (config.emit_webdata) {
+        const webdata = try buildpkg.GhosttyWebdata.init(b, &deps);
+        webdata.install();
+    }
 
     // Ghostty bench tools
-    const bench = try buildpkg.GhosttyBench.init(b, &deps);
-    if (config.emit_bench) bench.install();
-
-    // Ghostty dist tarball
-    const dist = try buildpkg.GhosttyDist.init(b, &config);
-    {
-        const step = b.step("dist", "Build the dist tarball");
-        step.dependOn(dist.install_step);
-        const check_step = b.step("distcheck", "Install and validate the dist tarball");
-        check_step.dependOn(dist.check_step);
-        check_step.dependOn(dist.install_step);
+    if (config.emit_bench) {
+        const bench = try buildpkg.GhosttyBench.init(b, &deps);
+        bench.install();
     }
 
     // If we're not building libghostty, then install the exe and resources.

build.zig.zon

@@ -14,8 +14,8 @@
         },
         .vaxis = .{
             // rockorager/libvaxis
-            .url = "git+https://github.com/rockorager/libvaxis#4182b7fa42f27cf14a71dbdb54cfd82c5c6e3447",
-            .hash = "vaxis-0.1.0-BWNV_MHyCAA0rNbPTr50Z44PyEdNP9zQSnHcXBXoo3Ti",
+            .url = "git+https://github.com/rockorager/libvaxis#1e24e0dfb509e974e1c8713bcd119d0ae032a8c7",
+            .hash = "vaxis-0.1.0-BWNV_MHyCAARemSCSwwc3sA1etNgv7ge0BCIXspX6CZv",
             .lazy = true,
         },
         .z2d = .{
@@ -48,15 +48,15 @@
         },
         .zf = .{
             // natecraddock/zf
-            .url = "https://github.com/natecraddock/zf/archive/1039cf75447a8d5b8d481fedb914fe848d246276.tar.gz",
-            .hash = "zf-0.10.3-OIRy8bKIAADhjqtdjVaDfONRuI7RVl5gMbhCoOwiBWV5",
+            .url = "https://github.com/natecraddock/zf/archive/03176fcf23fda543cc02a8675e92c1fe3b1ee2eb.tar.gz",
+            .hash = "zf-0.10.3-OIRy8bKIAACV6JaNNncXA68Nw2BUAD9JVfQdzjyoZQ-J",
             .lazy = true,
         },
         .gobject = .{
             // https://github.com/jcollie/ghostty-gobject based on zig_gobject
             // Temporary until we generate them at build time automatically.
-            .url = "https://github.com/jcollie/ghostty-gobject/releases/download/0.14.0-2025-03-18-21-1/ghostty-gobject-0.14.0-2025-03-18-21-1.tar.zst",
-            .hash = "gobject-0.2.0-Skun7IWDlQAOKu4BV7LapIxL9Imbq1JRmzvcIkazvAxR",
+            .url = "https://github.com/jcollie/ghostty-gobject/releases/download/0.14.0-2025-03-11-16-1/ghostty-gobject-0.14.0-2025-03-11-16-1.tar.gz",
+            .hash = "gobject-0.2.0-Skun7H6DlQDWCiNQtdE5TXYcCvx7MyjW01OQe5M_n_jV",
             .lazy = true,
         },
 
@@ -103,8 +103,8 @@
         // Other
         .apple_sdk = .{ .path = "./pkg/apple-sdk" },
         .iterm2_themes = .{
-            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e348884a00ef6c98dc837a873c4a867c9164d8a0.tar.gz",
-            .hash = "N-V-__8AAOCKKgR3_ixUa8LPz0Zz8okA9C6A3kXVLbmdLsGP",
+            .url = "https://github.com/mbadolato/iTerm2-Color-Schemes/archive/e21d5ffd19605741d0e3e19d7c5a8c6c25648673.tar.gz",
+            .hash = "N-V-__8AAABBKARxrVb9mEr7T5TUQbbqPiHxdBoOAmsChg2a",
             .lazy = true,
         },
     },