Sync upstream

.github/workflows/build.yml

@@ -0,0 +1,28 @@
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  macos_latest:
+    name: macos_latest
+    uses: bazelbuild/tulsi/.github/workflows/macos.yml@master
+    with:
+      bazel: latest
+      name: macos_latest
+  macos_last_green:
+    name: macos_last_green
+    uses: bazelbuild/tulsi/.github/workflows/macos.yml@master
+    with:
+      bazel: last_green
+      name: macos_last_green
+  macos_latest_head_deps:
+    name: macos_latest_head_deps
+    uses: bazelbuild/tulsi/.github/workflows/macos.yml@master
+    with:
+      bazel: rolling
+      name: macos_latest_head_deps
+      shell_commands: .bazelci/update_workspace_to_deps_heads.sh

.github/workflows/macos.yml

@@ -0,0 +1,50 @@
+on:
+  workflow_call:
+    inputs:
+      name:
+        type: string
+      bazel:
+        type: string
+        default: latest
+      xcode_version:
+        type: string
+        default: "13.2.1"
+      build_targets:
+        type: string
+        default: //:tulsi
+      test_flags:
+        type: string
+        default: --nocheck_visibility --sandbox_writable_path=/Users/runner/Library/Application\ Support
+      test_targets:
+        type: string
+        default: //:tests
+      shell_commands:
+        type: string
+        default: ""
+
+jobs:
+  macos:
+    runs-on: macos-11
+    env:
+      USE_BAZEL_VERSION: ${{ inputs.bazel }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install bazelisk
+      run: mv -f `which bazelisk` `which bazel`
+    - name: Shell commands
+      run: ${{ inputs.shell_commands }}
+    - name: Xcode select
+      run: sudo xcode-select -s /Applications/Xcode_${{ inputs.xcode_version }}.app/Contents/Developer
+    - name: Build
+      run: bazel build -- ${{ inputs.build_targets }}
+    - name: Test
+      run: bazel test ${{ inputs.test_flags }} --test_env=USE_BAZEL_VERSION -- ${{ inputs.test_targets }}
+    - name: Copy testlogs
+      run: rsync -rmL --include "*/" --include "test.log" --exclude "*" bazel-testlogs testlogs
+      if: failure()
+    - uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: testlogs-${{ inputs.name }}
+        path: testlogs/

.gitignore

@@ -24,3 +24,6 @@ src/build/
 binary/
 binary/appcast.xml
 .build/
+
+# CI collected testlogs
+/testlogs

CODEOWNERS

@@ -0,0 +1 @@
+* @BalestraPatrick @brentleyjones @keith @segiddins @thii

src/TulsiGenerator/Bazel/tulsi/tulsi_aspects.bzl

@@ -32,6 +32,7 @@ load(
     "TULSI_COMPILE_DEPS",
     "attrs_for_target_kind",
 )
+load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
 
 ObjcInfo = apple_common.Objc
@@ -203,9 +204,11 @@ def _convert_outpath_to_symlink_path(path):
 
 def _is_file_a_directory(f):
     """Returns True is the given file is a directory."""
+
     # Starting Bazel 3.3.0, the File type as a is_directory attribute.
     if getattr(f, "is_directory", None):
         return f.is_directory
+
     # If is_directory is not in the File type, fall back to the old method:
     # As of Oct. 2016, Bazel disallows most files without extensions.
     # As a temporary hack, Tulsi treats File instances pointing at extension-less
@@ -370,14 +373,32 @@ def _collect_framework_imports(rule_attr):
         ".framework",
     )
 
-def _collect_xcframework_imports(rule_attr):
-    """Extracts xcframework directories from the given rule attributes."""
-    return _collect_bundle_paths(
+def _collect_framework_imports_from_xcframework_imports(
+        rule_attr,
+        target_triplet):
+    """Extracts framework directories from xcframework imports for the current target platform."""
+    all_framework_paths = _collect_bundle_paths(
         rule_attr,
         ["xcframework_imports"],
-        ".xcframework",
+        ".framework",
     )
 
+    framework_imports = []
+    for p in all_framework_paths:
+        path = p.path
+        library_identifier = paths.basename(paths.dirname(path))
+        if not library_identifier.startswith(target_triplet.os):
+            continue
+        if target_triplet.architecture not in library_identifier:
+            continue
+        if target_triplet.environment != "simulator" and library_identifier.endswith("-simulator"):
+            continue
+        if target_triplet.environment == "simulator" and not library_identifier.endswith("-simulator"):
+            continue
+        framework_imports.append(p)
+
+    return framework_imports
+
 def _collect_xcdatamodeld_files(obj, attr_path):
     """Returns artifact_location's for xcdatamodeld's for attr_path in obj."""
     files = _collect_files(obj, attr_path)
@@ -923,6 +944,14 @@ def _tulsi_sources_aspect(target, ctx):
         test_deps = None
         module_name = None
 
+    cc_toolchain = find_cpp_toolchain(ctx)
+    target_triplet = _get_apple_clang_triplet(cc_toolchain)
+    framework_imports = _collect_framework_imports(rule_attr) + \
+                        _collect_framework_imports_from_xcframework_imports(
+                            rule_attr,
+                            target_triplet,
+                        )
+
     info = _struct_omitting_none(
         artifacts = artifacts,
         attr = _struct_omitting_none(**all_attributes),
@@ -935,7 +964,7 @@ def _tulsi_sources_aspect(target, ctx):
         test_deps = test_deps,
         extensions = extensions,
         app_clips = app_clips,
-        framework_imports = _collect_framework_imports(rule_attr),
+        framework_imports = framework_imports,
         generated_files = generated_files,
         generated_non_arc_files = generated_non_arc_files,
         includes = target_includes,
@@ -1089,6 +1118,52 @@ def _filter_deps(filter, deps):
             kept_deps.append(dep)
     return kept_deps
 
+# Copied from https://github.com/bazelbuild/rules_apple/blob/8533494fa029f0fc44009c4532c191f349acf193/apple/internal/cc_toolchain_info_support.bzl
+# TODO: Remove once rules_apple has been updated to include that.
+def _get_apple_clang_triplet(cc_toolchain):
+    """Parses and performs normalization on Clang target triplet string reference.
+
+    The C++ ToolchainInfo provider `target_gnu_system_name` field references an LLVM target triple.
+    This support method parses this target triplet and normalizes information for Apple targets.
+
+    See: https://clang.llvm.org/docs/CrossCompilation.html#target-triple
+
+    Args:
+        cc_toolchain: CcToolchainInfo provider.
+    Returns:
+        A normalized Clang target triplet struct for Apple targets.
+    """
+    components = cc_toolchain.target_gnu_system_name.split("-")
+    raw_triplet = struct(
+        architecture = components[0],
+        vendor = components[1],
+        os = components[2],
+        environment = components[3] if len(components) > 3 else None,
+    )
+
+    if raw_triplet.vendor != "apple":
+        return raw_triplet
+
+    environment = "device" if (raw_triplet.environment == None) else "simulator"
+
+    # strip version from Apple platforms
+    os = raw_triplet.os
+    for index in range(len(raw_triplet.os)):
+        if raw_triplet.os[index].isdigit():
+            os = raw_triplet.os[:index]
+            break
+
+    # normalize MacOS names
+    if os in ("macos", "macosx", "darwin"):
+        os = "macos"
+
+    return struct(
+        architecture = raw_triplet.architecture,
+        vendor = raw_triplet.vendor,
+        os = os,
+        environment = environment,
+    )
+
 def _tulsi_outputs_aspect(target, ctx):
     """Collects outputs of each build invocation."""
 

src/TulsiGenerator/Scripts/GoldenProjects/SimpleProject.xcodeproj/xcshareddata/xcschemes/AllTests_Suite.xcscheme

@@ -0,0 +1,92 @@
+
+<Scheme version="1.3" LastUpgradeVersion="1000">
+    <BuildAction parallelizeBuildables="YES" buildImplicitDependencies="YES">
+        <BuildActionEntries>
+            <BuildActionEntry buildForAnalyzing="YES" buildForRunning="YES" buildForProfiling="YES" buildForArchiving="YES" buildForTesting="YES">
+                <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+            </BuildActionEntry>
+        </BuildActionEntries>
+        <PreActions>
+            <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+                <ActionContent scriptText="This is a build pre action script" title="Run Script">
+                    <EnvironmentBuildable>
+                        <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+                    </EnvironmentBuildable>
+                </ActionContent>
+            </ExecutionAction>
+        </PreActions>
+        <PostActions>
+            <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+                <ActionContent scriptText="This is a build post action script" title="Run Script">
+                    <EnvironmentBuildable>
+                        <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+                    </EnvironmentBuildable>
+                </ActionContent>
+            </ExecutionAction>
+        </PostActions>
+    </BuildAction>
+    <TestAction shouldUseLaunchSchemeArgsEnv="YES" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" buildConfiguration="__TulsiTestRunner_Debug">
+        <Testables>
+            <TestableReference skipped="NO">
+                <BuildableReference BuildableName="XCTest.xctest" BlueprintName="XCTest" BlueprintIdentifier="7E9AFE6285821F1A00000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+            </TestableReference>
+        </Testables>
+        <PreActions>
+            <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+                <ActionContent scriptText="This is a test pre action script" title="Run Script">
+                    <EnvironmentBuildable>
+                        <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+                    </EnvironmentBuildable>
+                </ActionContent>
+            </ExecutionAction>
+        </PreActions>
+        <PostActions>
+            <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+                <ActionContent scriptText="This is a test post action script" title="Run Script">
+                    <EnvironmentBuildable>
+                        <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+                    </EnvironmentBuildable>
+                </ActionContent>
+            </ExecutionAction>
+        </PostActions>
+        <MacroExpansion>
+            <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+        </MacroExpansion>
+    </TestAction>
+    <LaunchAction debugServiceExtension="internal" selectedLauncherIdentifier="Xcode.DebuggerFoundation.Launcher.LLDB" selectedDebuggerIdentifier="Xcode.DebuggerFoundation.Debugger.LLDB" buildConfiguration="Debug" debugDocumentVersioning="YES" launchStyle="0" ignoresPersistentStateOnLaunch="NO" allowLocationSimulation="YES" customLLDBInitFile="$(PROJECT_FILE_PATH)/.tulsi/Utils/lldbinit" useCustomWorkingDirectory="NO">
+        <CommandLineArguments>
+            <CommandLineArgument isEnabled="YES" argument="--project-flag"></CommandLineArgument>
+        </CommandLineArguments>
+        <EnvironmentVariables>
+            <EnvironmentVariable value="projectValue" isEnabled="YES" key="projectKey"></EnvironmentVariable>
+        </EnvironmentVariables>
+        <PreActions>
+            <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+                <ActionContent scriptText="This is a lauch pre action script" title="Run Script">
+                    <EnvironmentBuildable>
+                        <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+                    </EnvironmentBuildable>
+                </ActionContent>
+            </ExecutionAction>
+        </PreActions>
+        <PostActions>
+            <ExecutionAction ActionType="Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+                <ActionContent scriptText="This is a launch post action script" title="Run Script">
+                    <EnvironmentBuildable>
+                        <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+                    </EnvironmentBuildable>
+                </ActionContent>
+            </ExecutionAction>
+        </PostActions>
+        <BuildableProductRunnable runnableDebuggingMode="0">
+            <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+        </BuildableProductRunnable>
+    </LaunchAction>
+    <ProfileAction useCustomWorkingDirectory="NO" shouldUseLaunchSchemeArgsEnv="YES" debugDocumentVersioning="YES" buildConfiguration="__TulsiTestRunner_Release">
+        <BuildableProductRunnable runnableDebuggingMode="0">
+            <BuildableReference BuildableName="Application.app" BlueprintName="Application" BlueprintIdentifier="7E9AFE6267D9455000000000" ReferencedContainer="container:SimpleProject.xcodeproj" BuildableIdentifier="primary"></BuildableReference>
+        </BuildableProductRunnable>
+    </ProfileAction>
+    <AnalyzeAction buildConfiguration="Debug"></AnalyzeAction>
+    <ArchiveAction revealArchiveInOrganizer="YES" buildConfiguration="Release"></ArchiveAction>
+</Scheme>