From 0d5e61e7e67285efe8c9fbe9fd6d9c6389b3cbba Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 24 Jun 2026 15:28:00 +0530 Subject: [PATCH] Rationalize build/test/package cycle --- .github/workflows/ci.py | 8 +++++--- .github/workflows/ci.yml | 12 ------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.py b/.github/workflows/ci.py index a9559d01c..80f7c5706 100644 --- a/.github/workflows/ci.py +++ b/.github/workflows/ci.py @@ -163,7 +163,8 @@ def install_deps() -> None: run('sudo apt-get install -y --fix-missing libgl1-mesa-dev libxi-dev libxrandr-dev libxinerama-dev ca-certificates' ' 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') + ' 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 run('sudo chmod -R og-w /usr/share/zsh') @@ -198,6 +199,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())"') @@ -328,9 +330,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 e61af9115..f50764a80 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