Skip to content

Commit ac52af2

Browse files
committed
gtk: nuke the legacy apprt from orbit
We don't really have any large outstanding regressions on -ng to warrant keeping this alive anymore. ¡Adiós!
1 parent c3e7857 commit ac52af2

67 files changed

Lines changed: 21 additions & 13098 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yml

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- build-macos-matrix
2323
- build-windows
2424
- test
25-
- test-gtk
2625
- test-gtk-ng
2726
- test-sentry-linux
2827
- test-macos
@@ -492,65 +491,13 @@ jobs:
492491
- name: test
493492
run: nix develop -c zig build -Dapp-runtime=none test
494493

495-
- name: Test GTK Build
496-
run: nix develop -c zig build -Dapp-runtime=gtk -Demit-docs -Demit-webdata
497-
498494
- name: Test GTK-NG Build
499495
run: nix develop -c zig build -Dapp-runtime=gtk-ng -Demit-docs -Demit-webdata
500496

501497
# This relies on the cache being populated by the commands above.
502498
- name: Test System Build
503499
run: nix develop -c zig build --system ${ZIG_GLOBAL_CACHE_DIR}/p
504500

505-
test-gtk:
506-
strategy:
507-
fail-fast: false
508-
matrix:
509-
x11: ["true", "false"]
510-
wayland: ["true", "false"]
511-
name: GTK x11=${{ matrix.x11 }} wayland=${{ matrix.wayland }}
512-
runs-on: namespace-profile-ghostty-sm
513-
needs: test
514-
env:
515-
ZIG_LOCAL_CACHE_DIR: /zig/local-cache
516-
ZIG_GLOBAL_CACHE_DIR: /zig/global-cache
517-
steps:
518-
- name: Checkout code
519-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
520-
521-
- name: Setup Cache
522-
uses: namespacelabs/nscloud-cache-action@a289cf5d2fcd6874376aa92f0ef7f99dc923592a # v1.2.17
523-
with:
524-
path: |
525-
/nix
526-
/zig
527-
528-
# Install Nix and use that to run our tests so our environment matches exactly.
529-
- uses: cachix/install-nix-action@56a7bb7b56d9a92d4fd1bc05758de7eea4a370a8 # v31.6.0
530-
with:
531-
nix_path: nixpkgs=channel:nixos-unstable
532-
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
533-
with:
534-
name: ghostty
535-
authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
536-
537-
- name: Test
538-
run: |
539-
nix develop -c \
540-
zig build \
541-
-Dapp-runtime=gtk \
542-
-Dgtk-x11=${{ matrix.x11 }} \
543-
-Dgtk-wayland=${{ matrix.wayland }} \
544-
test
545-
546-
- name: Build
547-
run: |
548-
nix develop -c \
549-
zig build \
550-
-Dapp-runtime=gtk \
551-
-Dgtk-x11=${{ matrix.x11 }} \
552-
-Dgtk-wayland=${{ matrix.wayland }}
553-
554501
test-gtk-ng:
555502
strategy:
556503
fail-fast: false

CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
/pkg/harfbuzz/ @ghostty-org/font
119119

120120
# GTK
121-
/src/apprt/gtk/ @ghostty-org/gtk
122121
/src/apprt/gtk-ng/ @ghostty-org/gtk
123122
/src/os/cgroup.zig @ghostty-org/gtk
124123
/src/os/flatpak.zig @ghostty-org/gtk

src/apprt.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const structs = @import("apprt/structs.zig");
1616

1717
pub const action = @import("apprt/action.zig");
1818
pub const ipc = @import("apprt/ipc.zig");
19-
pub const gtk = @import("apprt/gtk.zig");
2019
pub const gtk_ng = @import("apprt/gtk-ng.zig");
2120
pub const none = @import("apprt/none.zig");
2221
pub const browser = @import("apprt/browser.zig");
@@ -43,7 +42,6 @@ pub const SurfaceSize = structs.SurfaceSize;
4342
pub const runtime = switch (build_config.artifact) {
4443
.exe => switch (build_config.app_runtime) {
4544
.none => none,
46-
.gtk => gtk,
4745
.@"gtk-ng" => gtk_ng,
4846
},
4947
.lib => embedded,
@@ -64,11 +62,6 @@ pub const Runtime = enum {
6462
/// approach to building the application.
6563
@"gtk-ng",
6664

67-
/// GTK-backed. Rich windowed application. GTK is dynamically linked.
68-
/// WARNING: Deprecated. This will be removed very soon. All bug fixes
69-
/// and features should go into the gtk-ng backend.
70-
gtk,
71-
7265
pub fn default(target: std.Target) Runtime {
7366
return switch (target.os.tag) {
7467
// The Linux and FreeBSD default is GTK because it is a full

src/apprt/action.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ pub const InitialSize = extern struct {
542542

543543
/// Make this a valid gobject if we're in a GTK environment.
544544
pub const getGObjectType = switch (build_config.app_runtime) {
545-
.gtk, .@"gtk-ng" => @import("gobject").ext.defineBoxed(
545+
.@"gtk-ng" => @import("gobject").ext.defineBoxed(
546546
InitialSize,
547547
.{ .name = "GhosttyApprtInitialSize" },
548548
),

src/apprt/gtk.zig

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)