Skip to content

Commit a26fb24

Browse files
committed
Disable graphite for now
1 parent 9fea55e commit a26fb24

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/build.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ on:
88
branches:
99
- '**'
1010

11+
env:
12+
# Set to "true" to enable Graphite (adds --graphite to build commands)
13+
GRAPHITE: "false"
14+
1115
jobs:
1216
headers:
1317
name: Headers
@@ -66,7 +70,7 @@ jobs:
6670
- name: Build (${{ matrix.arch }})
6771
shell: pwsh
6872
run: |
69-
depot_tools/python-bin/python3.bat scripts/build.py windows ${{ matrix.arch }}
73+
depot_tools/python-bin/python3.bat scripts/build.py windows ${{ matrix.arch }} ${{ env.GRAPHITE == 'true' && '--graphite' || '' }}
7074
7175
- name: Upload artifact
7276
uses: actions/upload-artifact@v4
@@ -109,7 +113,7 @@ jobs:
109113
110114
- name: Build (arch)
111115
run: |
112-
scripts/build-linux.sh ${{ matrix.arch }}
116+
scripts/build-linux.sh ${{ matrix.arch }} ${{ env.GRAPHITE == 'true' && '--graphite' || '' }}
113117
114118
- name: Upload artifacts
115119
uses: actions/upload-artifact@v4
@@ -139,7 +143,7 @@ jobs:
139143
python3 tools/git-sync-deps
140144
141145
- name: Build
142-
run: python3 scripts/build.py macos all
146+
run: python3 scripts/build.py macos all ${{ env.GRAPHITE == 'true' && '--graphite' || '' }}
143147

144148
- name: Upload artifact
145149
uses: actions/upload-artifact@v4

scripts/build.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ def gen_windows(arch, self_contained, args):
249249
"/guard:cf",
250250
])
251251

252-
def build_target(target_os, arch, self_contained, debug):
252+
def build_target(target_os, arch, self_contained, debug, graphite):
253253
output_name = f"{target_os}_{arch}"
254254
if debug:
255255
output_name += "_debug"
@@ -275,8 +275,9 @@ def build_target(target_os, arch, self_contained, debug):
275275
"skia_enable_skottie": True,
276276
"skia_use_harfbuzz": False,
277277
"skia_enable_ganesh": True,
278-
"skia_enable_graphite": True,
279-
"skia_use_dawn": True,
278+
# Controlled by --graphite flag (default: False)
279+
"skia_enable_graphite": bool(graphite),
280+
"skia_use_dawn": bool(graphite),
280281
}
281282

282283
if canonical_os == "linux":
@@ -347,6 +348,7 @@ def main():
347348
args = argv[2:]
348349
self_contained = "--self-contained" in args
349350
debug = "--debug" in args
351+
graphite = "--graphite" in args
350352

351353
# prepend ../depot_tools to PATH
352354
depot_tools_path = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "depot_tools"))
@@ -355,9 +357,9 @@ def main():
355357

356358
if arch == "all":
357359
for a in ["x64", "arm64"]:
358-
build_target(target_os, a, self_contained, debug)
360+
build_target(target_os, a, self_contained, debug, graphite)
359361
else:
360-
build_target(target_os, arch, self_contained, debug)
362+
build_target(target_os, arch, self_contained, debug, graphite)
361363

362364
if __name__ == "__main__":
363365
main()

0 commit comments

Comments
 (0)