From f66a44eb51cbc7bce6e26f5b5870c63b384b95bd Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 2 Jun 2023 17:43:27 -0700 Subject: [PATCH 1/7] Test arm64 failures. --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 59b87222c3193..113e62eb8ae5f 100644 --- a/DEPS +++ b/DEPS @@ -39,7 +39,7 @@ vars = { # The list of revisions for these tools comes from Fuchsia, here: # https://fuchsia.googlesource.com/integration/+/HEAD/toolchain # If there are problems with the toolchain, contact fuchsia-toolchain@. - 'clang_version': 'git_revision:6d667d4b261e81f325756fdfd5bb43b3b3d2451d', + 'clang_version': 'git_revision:5344d8e10bb7d8672d4bfae8adb010465470d51b', # The goma version and the clang version can be tightly coupled. If goma # stops working on a clang roll, this may need to be updated using the value From 1c802364740dd9f2e848964a9bb96b74e57a8a9f Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 2 Jun 2023 18:06:41 -0700 Subject: [PATCH 2/7] Use correct arch dsym file. --- sky/tools/create_embedder_framework.py | 3 ++- sky/tools/create_full_ios_framework.py | 3 ++- sky/tools/create_ios_framework.py | 3 ++- sky/tools/create_macos_framework.py | 4 +++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sky/tools/create_embedder_framework.py b/sky/tools/create_embedder_framework.py index 357095785272e..505c80dc2b369 100755 --- a/sky/tools/create_embedder_framework.py +++ b/sky/tools/create_embedder_framework.py @@ -14,8 +14,9 @@ os.path.join(os.path.realpath(__file__), '..', '..', '..', '..') ) +ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64', + os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_full_ios_framework.py index 3c1e0f979cd32..014986f175386 100644 --- a/sky/tools/create_full_ios_framework.py +++ b/sky/tools/create_full_ios_framework.py @@ -15,8 +15,9 @@ from create_xcframework import create_xcframework # pylint: disable=import-error +ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64', + os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py index f0815df23d745..b8a2d912f37ca 100755 --- a/sky/tools/create_ios_framework.py +++ b/sky/tools/create_ios_framework.py @@ -12,8 +12,9 @@ from create_xcframework import create_xcframework # pylint: disable=import-error +ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64', + os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index bbe047fad0a2c..d81c1c07b253b 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -5,6 +5,7 @@ # found in the LICENSE file. import argparse +import platform import subprocess import shutil import sys @@ -14,8 +15,9 @@ os.path.join(os.path.realpath(__file__), '..', '..', '..', '..') ) +ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' DSYMUTIL = os.path.join( - os.path.dirname(__file__), '..', '..', '..', 'buildtools', 'mac-x64', + os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' ) From d0d3e8ffd21622d6473ef7cc628f95073f5cc947 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 2 Jun 2023 18:31:05 -0700 Subject: [PATCH 3/7] Add imports. --- sky/tools/create_embedder_framework.py | 1 + sky/tools/create_full_ios_framework.py | 1 + sky/tools/create_ios_framework.py | 1 + 3 files changed, 3 insertions(+) diff --git a/sky/tools/create_embedder_framework.py b/sky/tools/create_embedder_framework.py index 505c80dc2b369..b0e2b06c82727 100755 --- a/sky/tools/create_embedder_framework.py +++ b/sky/tools/create_embedder_framework.py @@ -5,6 +5,7 @@ # found in the LICENSE file. import argparse +import platform import subprocess import shutil import sys diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_full_ios_framework.py index 014986f175386..f599405a43843 100644 --- a/sky/tools/create_full_ios_framework.py +++ b/sky/tools/create_full_ios_framework.py @@ -9,6 +9,7 @@ import argparse import os +import platform import shutil import subprocess import sys diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py index b8a2d912f37ca..e057de1ca2fb1 100755 --- a/sky/tools/create_ios_framework.py +++ b/sky/tools/create_ios_framework.py @@ -5,6 +5,7 @@ # found in the LICENSE file. import argparse +import platform import subprocess import shutil import sys From 3d42c63698f4120fa3bb5f69b203ea8612b93e12 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 2 Jun 2023 20:51:51 -0700 Subject: [PATCH 4/7] Compare platform. --- sky/tools/create_embedder_framework.py | 2 +- sky/tools/create_full_ios_framework.py | 2 +- sky/tools/create_ios_framework.py | 2 +- sky/tools/create_macos_framework.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sky/tools/create_embedder_framework.py b/sky/tools/create_embedder_framework.py index b0e2b06c82727..abc628d15ca89 100755 --- a/sky/tools/create_embedder_framework.py +++ b/sky/tools/create_embedder_framework.py @@ -15,7 +15,7 @@ os.path.join(os.path.realpath(__file__), '..', '..', '..', '..') ) -ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_full_ios_framework.py index f599405a43843..cf66ce20a9c40 100644 --- a/sky/tools/create_full_ios_framework.py +++ b/sky/tools/create_full_ios_framework.py @@ -16,7 +16,7 @@ from create_xcframework import create_xcframework # pylint: disable=import-error -ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py index e057de1ca2fb1..6d6b1a909583b 100755 --- a/sky/tools/create_ios_framework.py +++ b/sky/tools/create_ios_framework.py @@ -13,7 +13,7 @@ from create_xcframework import create_xcframework # pylint: disable=import-error -ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index d81c1c07b253b..1919ce9c3c9de 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -15,7 +15,7 @@ os.path.join(os.path.realpath(__file__), '..', '..', '..', '..') ) -ARCH_SUBPATH = 'mac-arm64' if platform.processor() else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' From e05ef573312111df92687700ea65b2824c233638 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 2 Jun 2023 21:41:52 -0700 Subject: [PATCH 5/7] Format files. --- sky/tools/create_full_ios_framework.py | 2 +- sky/tools/create_ios_framework.py | 2 +- sky/tools/create_macos_framework.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sky/tools/create_full_ios_framework.py b/sky/tools/create_full_ios_framework.py index cf66ce20a9c40..5858ddefb7b12 100644 --- a/sky/tools/create_full_ios_framework.py +++ b/sky/tools/create_full_ios_framework.py @@ -16,7 +16,7 @@ from create_xcframework import create_xcframework # pylint: disable=import-error -ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' diff --git a/sky/tools/create_ios_framework.py b/sky/tools/create_ios_framework.py index 6d6b1a909583b..a95ec4131ca48 100755 --- a/sky/tools/create_ios_framework.py +++ b/sky/tools/create_ios_framework.py @@ -13,7 +13,7 @@ from create_xcframework import create_xcframework # pylint: disable=import-error -ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' diff --git a/sky/tools/create_macos_framework.py b/sky/tools/create_macos_framework.py index 1919ce9c3c9de..c1382527ad4c2 100755 --- a/sky/tools/create_macos_framework.py +++ b/sky/tools/create_macos_framework.py @@ -15,7 +15,7 @@ os.path.join(os.path.realpath(__file__), '..', '..', '..', '..') ) -ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' From 279476427544a6988b1919a5aa6f36834bdbe51b Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Fri, 2 Jun 2023 22:09:57 -0700 Subject: [PATCH 6/7] Format create embedder. --- sky/tools/create_embedder_framework.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sky/tools/create_embedder_framework.py b/sky/tools/create_embedder_framework.py index abc628d15ca89..bd55a5674a281 100755 --- a/sky/tools/create_embedder_framework.py +++ b/sky/tools/create_embedder_framework.py @@ -15,7 +15,7 @@ os.path.join(os.path.realpath(__file__), '..', '..', '..', '..') ) -ARCH_SUBPATH = 'mac-arm64' if platform.processor()=='arm' else 'mac-x64' +ARCH_SUBPATH = 'mac-arm64' if platform.processor() == 'arm' else 'mac-x64' DSYMUTIL = os.path.join( os.path.dirname(__file__), '..', '..', '..', 'buildtools', ARCH_SUBPATH, 'clang', 'bin', 'dsymutil' From 4cad1133b2570c99d55f6f5a26d1272091372140 Mon Sep 17 00:00:00 2001 From: Godofredo Contreras Date: Mon, 5 Jun 2023 14:25:59 -0700 Subject: [PATCH 7/7] Revert DEPs changes. --- DEPS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPS b/DEPS index 113e62eb8ae5f..59b87222c3193 100644 --- a/DEPS +++ b/DEPS @@ -39,7 +39,7 @@ vars = { # The list of revisions for these tools comes from Fuchsia, here: # https://fuchsia.googlesource.com/integration/+/HEAD/toolchain # If there are problems with the toolchain, contact fuchsia-toolchain@. - 'clang_version': 'git_revision:5344d8e10bb7d8672d4bfae8adb010465470d51b', + 'clang_version': 'git_revision:6d667d4b261e81f325756fdfd5bb43b3b3d2451d', # The goma version and the clang version can be tightly coupled. If goma # stops working on a clang roll, this may need to be updated using the value