Skip to content

Commit 255045b

Browse files
authored
[ci] Inject host_os value when parsing DEPS file (#286)
1 parent 0a8f3a6 commit 255045b

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,8 @@ jobs:
239239
--target-toolchain _ \
240240
--target-sysroot _ \
241241
--target-triple _ \
242-
--runtime-mode=${{ matrix.mode }}
242+
--runtime-mode=${{ matrix.mode }} \
243+
--disable-desktop-embeddings
243244
ninja -C src/out/$OUTPUT_NAME clang_x64/gen_snapshot
244245
245246
src/flutter/ci/tizen/cache-checksum.sh save src/out/$OUTPUT_NAME

ci/tizen/gclient-shallow-sync.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python
22

33
import os
4+
import platform
45
import sys
56
import subprocess
67
import concurrent.futures
@@ -10,7 +11,7 @@
1011

1112
def run_git(args, cwd):
1213
if not args:
13-
raise Exception('Please provide a git command to run')
14+
raise Exception('Please provide a git command to run.')
1415
return subprocess.call(['git'] + args, cwd=cwd) == 0
1516

1617

@@ -42,12 +43,21 @@ def checkout_deps(deps):
4243

4344
def main(argv):
4445
if (len(argv) < 1):
45-
raise Exception('Please provide a DEPS file to update')
46+
raise Exception('Please provide a DEPS file to update.')
4647
deps_file = argv[0]
4748
if not os.path.exists(deps_file):
48-
raise Exception('DEPS file does not exist')
49+
raise Exception('The DEPS file does not exist.')
50+
51+
host_os = 'linux'
52+
if platform.system() == 'Windows':
53+
host_os = 'win'
54+
if platform.system() == 'Darwin':
55+
host_os = 'mac'
56+
4957
deps_contents = gclient_utils.FileRead(deps_file)
50-
local_scope = gclient_eval.Parse(deps_contents, deps_file)
58+
local_scope = gclient_eval.Parse(
59+
deps_contents, deps_file, builtin_vars={'host_os': host_os})
60+
5161
checkout_deps(local_scope['deps'])
5262

5363

0 commit comments

Comments
 (0)