github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-05 19:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update CI

Browse source
This commit is contained in:
isaac 2026-05-26 23:32:44 +02:00
parent a250c71991
commit 81d8ae4c67
2 changed files with 58 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

50
build-system/Make/Make.py
View file

@ -1107,6 +1107,40 @@ if __name__ == '__main__':
type=str,
help='Bazel remote cache host address.'
)
remote_build_parser.add_argument(
'--embedWatchApp',
action='store_true',
default=False,
help='Embed the tgwatch watch app (from the in-repo Telegram/WatchApp snapshot) under Watch/ in the remote device build.'
)
remote_build_parser.add_argument(
'--watchApiId',
required=False,
type=str,
help='TG_API_ID for the watch build.',
metavar='api_id'
)
remote_build_parser.add_argument(
'--watchApiHash',
required=False,
type=str,
help='TG_API_HASH for the watch build.',
metavar='api_hash'
)
remote_build_parser.add_argument(
'--watchSigningIdentity',
required=False,
type=str,
help='Codesigning identity (SHA1 hash) for the watch app. The matching certificate must be present in the uploaded codesigning material.',
metavar='identity'
)
remote_build_parser.add_argument(
'--watchProvisioningProfile',
required=False,
type=str,
help='Local absolute path to the watchkitapp .mobileprovision file; uploaded to the remote build environment.',
metavar='path'
)
vm_build_parser = subparsers.add_parser('vm-build', help='Build the app using a VM.')
add_codesigning_common_arguments(vm_build_parser)
@ -1327,13 +1361,27 @@ if __name__ == '__main__':
shutil.copyfile(args.configurationPath, remote_input_path + '/configuration.json')
watch_provisioning_profile_remote_path = None
if args.embedWatchApp:
if args.watchApiId is None or args.watchApiHash is None:
raise Exception('--embedWatchApp requires --watchApiId and --watchApiHash (the embedded watch app build needs API credentials).')
if args.watchProvisioningProfile is not None:
shutil.copyfile(args.watchProvisioningProfile, remote_input_path + '/watch_provisioning_profile.mobileprovision')
# remote_input_path is uploaded to the guest as $HOME/telegram-build-input.
watch_provisioning_profile_remote_path = '$HOME/telegram-build-input/watch_provisioning_profile.mobileprovision'
RemoteBuild.remote_build_darwin_containers(
darwin_containers_path=args.darwinContainers,
darwin_containers_host=args.darwinContainersHost,
macos_version=versions.macos_version,
bazel_cache_host=args.cacheHost,
configuration=args.configuration,
build_input_data_path=remote_input_path
build_input_data_path=remote_input_path,
embed_watch_app=args.embedWatchApp,
watch_api_id=args.watchApiId,
watch_api_hash=args.watchApiHash,
watch_signing_identity=args.watchSigningIdentity,
watch_provisioning_profile_remote_path=watch_provisioning_profile_remote_path
)
elif args.commandName == 'vm-build':
base_path = os.getcwd()

10
build-system/Make/RemoteBuild.py
View file

@ -57,7 +57,7 @@ def session_ssh(session, command):
return os.system(ssh_command)
def remote_build_darwin_containers(darwin_containers_path, darwin_containers_host, macos_version, bazel_cache_host, configuration, build_input_data_path):
def remote_build_darwin_containers(darwin_containers_path, darwin_containers_host, macos_version, bazel_cache_host, configuration, build_input_data_path, embed_watch_app=False, watch_api_id=None, watch_api_hash=None, watch_signing_identity=None, watch_provisioning_profile_remote_path=None):
DarwinContainers = import_module_from_file('darwin-containers', darwin_containers_path)
base_dir = os.getcwd()
@ -135,6 +135,14 @@ def remote_build_darwin_containers(darwin_containers_path, darwin_containers_hos
guest_build_sh += '--configurationPath=$HOME/telegram-build-input/configuration.json \\'
guest_build_sh += '--codesigningInformationPath=$HOME/telegram-build-input \\'
guest_build_sh += '--outputBuildArtifactsPath=/Users/Shared/telegram-ios/build/artifacts \\'
if embed_watch_app:
guest_build_sh += '--embedWatchApp \\'
guest_build_sh += '--watchApiId="{}" \\'.format(watch_api_id)
guest_build_sh += '--watchApiHash="{}" \\'.format(watch_api_hash)
if watch_signing_identity is not None:
guest_build_sh += '--watchSigningIdentity="{}" \\'.format(watch_signing_identity)
if watch_provisioning_profile_remote_path is not None:
guest_build_sh += '--watchProvisioningProfile="{}" \\'.format(watch_provisioning_profile_remote_path)
guest_build_file_path = tempfile.mktemp()
with open(guest_build_file_path, 'w+') as file: