ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Configure macos version in versions.json

Browse Source
This commit is contained in:
Isaac 2023-12-21 16:13:08 +04:00
parent 9e1fe619bc
commit 84ad4f53b6
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build-system/Make/BuildEnvironment.py
View File

@ -140,6 +140,10 @@ class BuildEnvironmentVersions:
raise Exception('Missing xcode version in {}'.format(configuration_path))
else:
self.xcode_version = configuration_dict['xcode']
if configuration_dict['macos'] is None:
raise Exception('Missing macos version in {}'.format(configuration_path))
else:
self.macos_version = configuration_dict['macos']
class BuildEnvironment:
def __init__(
@ -179,3 +183,4 @@ class BuildEnvironment:
self.app_version = versions.app_version
self.xcode_version = versions.xcode_version
self.bazel_version = versions.bazel_version
self.macos_version = versions.macos

11
build-system/Make/Make.py
View File

@ -9,7 +9,7 @@ import subprocess
import shutil
import glob
from BuildEnvironment import resolve_executable, call_executable, run_executable_with_output, BuildEnvironment
from BuildEnvironment import resolve_executable, call_executable, run_executable_with_output, BuildEnvironmentVersions, BuildEnvironment
from ProjectGeneration import generate
from BazelLocation import locate_bazel
from BuildConfiguration import CodesigningSource, GitCodesigningSource, DirectoryCodesigningSource, XcodeManagedCodesigningSource, BuildConfiguration, build_configuration_from_json
@ -1059,6 +1059,8 @@ if __name__ == '__main__':
os.makedirs(remote_input_path + '/certs')
os.makedirs(remote_input_path + '/profiles')
versions = BuildEnvironmentVersions(base_path=os.getcwd())
resolve_configuration(
base_path=os.getcwd(),
bazel_command_line=None,
@ -1071,6 +1073,7 @@ if __name__ == '__main__':
RemoteBuild.remote_build(
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
@ -1105,18 +1108,24 @@ if __name__ == '__main__':
print('APPSTORE_CONNECT_PASSWORD environment variable is not set')
sys.exit(1)
versions = BuildEnvironmentVersions(base_path=os.getcwd())
RemoteBuild.remote_deploy_testflight(
darwin_containers_path=args.darwinContainers,
darwin_containers_host=args.darwinContainersHost,
macos_version=versions.macos_version,
ipa_path=args.ipa,
dsyms_path=args.dsyms,
username=env['APPSTORE_CONNECT_USERNAME'],
password=env['APPSTORE_CONNECT_PASSWORD']
)
elif args.commandName == 'remote-ipa-diff':
versions = BuildEnvironmentVersions(base_path=os.getcwd())
RemoteBuild.remote_ipa_diff(
darwin_containers_path=args.darwinContainers,
darwin_containers_host=args.darwinContainersHost,
macos_version=versions.macos_version,
ipa1_path=args.ipa1,
ipa2_path=args.ipa2
)

12
build-system/Make/RemoteBuild.py
View File

@ -55,9 +55,7 @@ def session_ssh(session, command):
return os.system(ssh_command)
def remote_build(darwin_containers_path, darwin_containers_host, bazel_cache_host, configuration, build_input_data_path):
macos_version = '13.0'
def remote_build(darwin_containers_path, darwin_containers_host, macos_version, bazel_cache_host, configuration, build_input_data_path):
DarwinContainers = import_module_from_file('darwin-containers', darwin_containers_path)
base_dir = os.getcwd()
@ -181,9 +179,7 @@ def remote_build(darwin_containers_path, darwin_containers_host, bazel_cache_hos
)
def remote_deploy_testflight(darwin_containers_path, darwin_containers_host, ipa_path, dsyms_path, username, password):
macos_version = '13.0'
def remote_deploy_testflight(darwin_containers_path, darwin_containers_host, macos_version, ipa_path, dsyms_path, username, password):
DarwinContainers = import_module_from_file('darwin-containers', darwin_containers_path)
configuration_path = 'versions.json'
@ -240,9 +236,7 @@ def remote_deploy_testflight(darwin_containers_path, darwin_containers_host, ipa
)
def remote_ipa_diff(darwin_containers_path, darwin_containers_host, ipa1_path, ipa2_path):
macos_version = '13.0'
def remote_ipa_diff(darwin_containers_path, darwin_containers_host, macos_version, ipa1_path, ipa2_path):
DarwinContainers = import_module_from_file('darwin-containers', darwin_containers_path)
configuration_path = 'versions.json'

3
versions.json
View File

@ -1,5 +1,6 @@
{
"app": "10.4",
"bazel": "6.4.0",
"xcode": "15.0"
"xcode": "15.0",
"macos": "13.0"
}