From 0131876e86bb7d95064041fcdcf5d05f1bcca51d Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 24 Jun 2026 15:28:00 +0530
Subject: [PATCH] Rationalize build/test/package cycle

---
 .github/workflows/ci.py  |  6 ++++--
 .github/workflows/ci.yml | 12 ------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.py b/.github/workflows/ci.py
index a0457472b..628fe8dda 100644
--- a/.github/workflows/ci.py
+++ b/.github/workflows/ci.py
@@ -167,6 +167,7 @@ def install_deps() -> None:
             ' libxcursor-dev libxcb-xkb-dev libdbus-1-dev libxkbcommon-dev libharfbuzz-dev libx11-xcb-dev zsh'
             ' libpng-dev liblcms2-dev libfontconfig-dev libxkbcommon-x11-dev libcanberra-dev libxxhash-dev uuid-dev'
             ' libsimde-dev libsystemd-dev libcairo2-dev zsh bash dash systemd-coredump gdb'
+            ' libwayland-dev wayland-protocols'
         )
         # for some reason these directories are world writable which causes zsh
         # compinit to break
@@ -202,6 +203,7 @@ def test_kitty() -> None:
 def package_kitty() -> None:
     python = 'python3' if is_macos else 'python'
     run(f'{python} setup.py linux-package --update-check-interval=0 --verbose')
+    run('make FAIL_WARN=1 docs')
     if is_macos:
         run('python3 setup.py kitty.app --update-check-interval=0 --verbose')
         run('kitty.app/Contents/MacOS/kitty +runpy "from kitty.constants import *; print(kitty_exe())"')
@@ -338,9 +340,9 @@ def main() -> None:
     if action == 'build':
         build_kitty()
     elif action == 'package':
-        package_kitty()
-    elif action == 'test':
+        build_kitty()
         test_kitty()
+        package_kitty()
     elif action == 'test':
         test_kitty()
     elif action == 'govulncheck':
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 808ebbd60..9b372674b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -124,9 +124,6 @@ jobs:
           - name: Run go vet
             run: go version && go vet -tags testing ./...
 
-          - name: Build docs
-            run: make FAIL_WARN=1 docs
-
           - name: Build static kittens
             run: python setup.py build-static-binaries
 
@@ -177,18 +174,9 @@ jobs:
             with:
               go-version-file: go.mod
 
-          - name: Build kitty
-            run: python3 .github/workflows/ci.py build
-
-          - name: Test kitty
-            run: python3 .github/workflows/ci.py test
-
           - name: Install deps for docs
             run: python3 -m pip install -r docs/requirements.txt
 
-          - name: Builds docs
-            run: make FAIL_WARN=1 docs
-
           - name: Build kitty package
             run: python3 .github/workflows/ci.py package