Use the bundle for CodeQL builds

Speeds up the dependency fetch and hopefully fixes the failure on macOS
This commit is contained in:
Kovid Goyal
2025-09-16 07:29:34 +05:30
parent 96253f4798
commit d647e21779
2 changed files with 12 additions and 7 deletions

View File

@@ -17,6 +17,7 @@ BUNDLE_URL = 'https://download.calibre-ebook.com/ci/kitty/{}-64.tar.xz'
FONTS_URL = 'https://download.calibre-ebook.com/ci/fonts.tar.xz' FONTS_URL = 'https://download.calibre-ebook.com/ci/fonts.tar.xz'
NERD_URL = 'https://github.com/ryanoasis/nerd-fonts/releases/latest/download/NerdFontsSymbolsOnly.tar.xz' NERD_URL = 'https://github.com/ryanoasis/nerd-fonts/releases/latest/download/NerdFontsSymbolsOnly.tar.xz'
is_bundle = os.environ.get('KITTY_BUNDLE') == '1' is_bundle = os.environ.get('KITTY_BUNDLE') == '1'
is_codeql = os.environ.get('KITTY_CODEQL') == '1'
is_macos = 'darwin' in sys.platform.lower() is_macos = 'darwin' in sys.platform.lower()
SW = '' SW = ''
@@ -84,13 +85,14 @@ def install_deps() -> None:
print('Installing kitty dependencies...') print('Installing kitty dependencies...')
sys.stdout.flush() sys.stdout.flush()
if is_macos: if is_macos:
items = [x.split()[1].strip('"') for x in open('Brewfile').readlines() if x.strip().startswith('brew ')] if not is_codeql: # for some reason brew fails on CodeQL we dont need it anyway
openssl = 'openssl' items = [x.split()[1].strip('"') for x in open('Brewfile').readlines() if x.strip().startswith('brew ')]
items.remove('go') # already installed by ci.yml openssl = 'openssl'
import ssl items.remove('go') # already installed by ci.yml
if ssl.OPENSSL_VERSION_INFO[0] == 1: import ssl
openssl += '@1.1' if ssl.OPENSSL_VERSION_INFO[0] == 1:
run('brew', 'install', 'fish', openssl, *items) openssl += '@1.1'
run('brew', 'install', 'fish', openssl, *items)
else: else:
run('sudo apt-get update') run('sudo apt-get update')
run('sudo apt-get install -y libgl1-mesa-dev libxi-dev libxrandr-dev libxinerama-dev ca-certificates' run('sudo apt-get install -y libgl1-mesa-dev libxi-dev libxrandr-dev libxinerama-dev ca-certificates'

View File

@@ -33,6 +33,9 @@ jobs:
os: ubuntu-latest os: ubuntu-latest
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
env:
KITTY_BUNDLE: 1
KITTY_CODEQL: 1
steps: steps: