Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args. #37

amberdixon · 2020-04-11T00:33:26Z

No description provided.

amberdixon · 2020-04-11T00:33:51Z

rules/xcodeproj.bzl

@@ -1,7 +1,7 @@
 load("@build_bazel_rules_apple//apple:providers.bzl", "AppleBundleInfo")
 load("@bazel_skylib//lib:paths.bzl", "paths")

-def _get_transitive(deps, provider, field):
+def _get_attr_values_for_name(deps, provider, field):


WDYT of this method rename? I thought this name was easier to understand, but open to hearing other options :)

amberdixon · 2020-04-11T00:34:44Z

rules/xcodeproj.bzl

@@ -81,11 +91,12 @@ def _xcodeproj_aspect_impl(target, ctx):
            actual = getattr(ctx.rule.attr, "tests")[0]
        elif ctx.rule.kind in ("alias"):


On line 92, how does the in keyword work. The line isctx.rule.kind in ("alias"):

Is ("alias") treated as a list with one item?

it's a single item tuple

… ensure that the scheme for the xcodeproject has the correct env and args

segiddins · 2020-04-11T00:53:05Z

rules/xcodeproj.bzl

@@ -81,11 +91,12 @@ def _xcodeproj_aspect_impl(target, ctx):
            actual = getattr(ctx.rule.attr, "tests")[0]
        elif ctx.rule.kind in ("alias"):


it's a single item tuple

segiddins · 2020-04-11T00:54:56Z

rules/xcodeproj.bzl

-        installer_path = ctx.executable.installer.short_path,
-    )
+
+    proj_options = {


this refactor is great!!

segiddins · 2020-04-11T00:57:18Z

rules/xcodeproj.bzl

@@ -234,6 +259,7 @@ xcodeproj = rule(
        "include_transitive_targets": attr.bool(default = False, mandatory = False),
        "project_name": attr.string(mandatory = False),
        "bazel_path": attr.string(mandatory = False, default = "bazel"),
+        "scheme_existing_envvar_overrides": attr.string_dict(allow_empty = True, default = {}, mandatory = False),


can you add a test project that uses this attr ?

segiddins · 2020-04-11T00:57:45Z

tests/xcodeproj/build.sh

@@ -2,4 +2,6 @@ set -eux

 cd $(dirname $0)

-xcodebuild -project Single-Application.xcodeproj -quiet
+xcodebuild -project Single-Application-Project.xcodeproj -quiet
+export SIM_DEVICE_ID=`xcodebuild -project Single-Application-Project.xcodeproj -scheme "Single-Application-UnitTests" -showdestinations | grep "platform:iOS Sim" | head -1 | ruby -e "puts STDIN.read.split(',')[1].split(':').last"`


can we add a set -o pipefail since this file now uses pipes?

I will put back this change in later when I need it, right now it is not necessary run these tests. I think it will be necessary when the tests ensure that runs can run, when they are supposed to run inside an apphost.

segiddins · 2020-04-11T01:05:57Z

tests/xcodeproj/test.swift

@@ -0,0 +1,12 @@
+import XCTest
+
+class SwiftTests : XCTestCase {


it seems like this test isn't passing when run directly via bazel

Yeah, it looks like it invokes a test runner and complains the argument is invalid. So I had changed the argument to -h, which is the help option for the test runner :D

ha! it's possible command line args aren't yet possible to pass to https://github.com/google/xctestrunner, which is the underlying test runner the apple rules hook up

segiddins · 2020-04-11T01:06:34Z

tests/xcodeproj/build.sh

-xcodebuild -project Single-Application.xcodeproj -quiet
+xcodebuild -project Single-Application-Project.xcodeproj -quiet
+export SIM_DEVICE_ID=`xcodebuild -project Single-Application-Project.xcodeproj -scheme "Single-Application-UnitTests" -showdestinations | grep "platform:iOS Sim" | head -1 | ruby -e "puts STDIN.read.split(',')[1].split(':').last"`
+xcodebuild -project Single-Application-Project.xcodeproj -scheme "Single-Application-UnitTests"  test-without-building -destination "id=$SIM_DEVICE_ID"


I think you might actually want test here, since this scheme hasnt been built yet. also maybe ad -quiet so the output is empty on success?

segiddins · 2020-04-11T01:11:20Z

rules/xcodeproj.bzl

-        arguments = ["--quiet", "--no-env", "--spec", xcodegen_yaml.path, "--project", project.dirname],
-        inputs = depset([xcodegen_yaml], transitive = [target.srcs for target in targets]),
+        arguments = ["--quiet", "--no-env", "--spec", xcodegen_jsonfile.path, "--project", project.dirname],
+        inputs = depset([xcodegen_jsonfile], transitive = [target.srcs for target in targets]),


i wonder if we can stop providing the srcs as inputs to this action, since we manually mark all of the as validate: false ?

According to this documentation, validate is not a field, but optional is. I have changed this to say optional: True.
https://github.com/yonaskolb/XcodeGen/blob/master/Docs/ProjectSpec.md#sources

segiddins · 2020-04-13T16:52:19Z

tests/xcodeproj/test.swift

@@ -2,11 +2,7 @@ import XCTest

 class SwiftTests : XCTestCase {
  func testPasses() {
-      let envvarvalue = ProcessInfo.processInfo.environment["test_envvar_key"]


why did you get rid of the tests for the args / env var?

See comment below. The functionality being added in this PR can be tested by doing git diff on the xcodeproject file and ensuring it hasn't changed.

segiddins · 2020-04-13T16:52:31Z

tests/xcodeproj/build.sh

@@ -2,6 +2,4 @@ set -eux

 cd $(dirname $0)

-xcodebuild -project Single-Application-Project.xcodeproj -quiet
-export SIM_DEVICE_ID=`xcodebuild -project Single-Application-Project.xcodeproj -scheme "Single-Application-UnitTests" -showdestinations | grep "platform:iOS Sim" | head -1 | ruby -e "puts STDIN.read.split(',')[1].split(':').last"`
-xcodebuild -project Single-Application-Project.xcodeproj -scheme "Single-Application-UnitTests"  test-without-building -destination "id=$SIM_DEVICE_ID"


why not run the test?

Since we validate that the scheme in the xcodeproject is associated with the correct set of env vars and cli args (by running git diff on the project.pbxproj file), we already ensure that bazel has correctly associated schemes with the right set of env and args.

segiddins

This is awesome!

amberdixon added 3 commits April 9, 2020 20:31

Refactor xcodeproj generation code. Read env vars from target.

0d33eb9

add in cli args, put back other stuff to generate project

7224259

Adding tests

905dd0c

amberdixon requested a review from segiddins April 11, 2020 00:33

amberdixon commented Apr 11, 2020

View reviewed changes

amberdixon added 7 commits April 10, 2020 17:38

Specify one target

701e7d9

Tweak to xcscheme file

49c5e90

buildifier

698c699

change argument name

3814a1d

more debugging for CI test failures

0d88b90

build and test on the same destination

9f671c3

it is not necessary to run this test, because the git diff check will…

8470ac2

… ensure that the scheme for the xcodeproject has the correct env and args

amberdixon changed the title ~~[WIP] Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args.~~ Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args. Apr 13, 2020

segiddins reviewed Apr 13, 2020

View reviewed changes

Address PR feedback, include test for scheme override argument

ada1bba

segiddins approved these changes Apr 15, 2020

View reviewed changes

buildifier fixes

135ff1c

amberdixon merged commit 6b4f101 into master Apr 16, 2020

segiddins deleted the amber/refactor-xcodegen-use-envvars branch April 16, 2020 18:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args. #37

Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args. #37

amberdixon commented Apr 11, 2020

amberdixon Apr 11, 2020

amberdixon Apr 11, 2020

segiddins Apr 11, 2020

segiddins Apr 11, 2020

segiddins Apr 11, 2020

segiddins Apr 11, 2020

segiddins Apr 11, 2020

segiddins Apr 11, 2020

amberdixon Apr 15, 2020

segiddins Apr 11, 2020

amberdixon Apr 15, 2020

segiddins Apr 15, 2020

segiddins Apr 11, 2020

segiddins Apr 11, 2020

amberdixon Apr 15, 2020

segiddins Apr 13, 2020

amberdixon Apr 15, 2020

segiddins Apr 13, 2020

amberdixon Apr 15, 2020

segiddins left a comment

		@@ -81,11 +91,12 @@ def _xcodeproj_aspect_impl(target, ctx):
		actual = getattr(ctx.rule.attr, "tests")[0]
		elif ctx.rule.kind in ("alias"):

		@@ -0,0 +1,12 @@
		import XCTest

		class SwiftTests : XCTestCase {

Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args. #37

Refactor Xcodeproject generation code. Add in xcode scheme test action env vars and command line args. #37

Conversation

amberdixon commented Apr 11, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

segiddins left a comment

Choose a reason for hiding this comment