Updates to Tulsi and bazelwrapper for 2.1.0rc1

.bazelrc

@@ -1,6 +1,5 @@
 build \
  --spawn_strategy=standalone \
  --strategy=SwiftCompile=worker \
- --incompatible_disallow_load_labels_to_cross_package_boundaries=false \
  --incompatible_new_actions_api=false \
  --experimental_strict_action_env=true

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Main workflow 
+name: Main workflow
 
 on: [pull_request]
 
@@ -9,7 +9,13 @@ jobs:
     steps:
     - name: Checkout the Git repository
       uses: actions/checkout@v1
-    - name: Setup dependencies 
-      run: sudo gem install cocoapods 
-    - name: Run Tests
-      run: make ci
+    - name: Setup dependencies
+      run: sudo gem install cocoapods
+    - name: Run Tests (test)
+      run: make test
+    - name: Run Swift Tests
+      run: make run_swift
+    - name: Run Goldmaster Tests
+      run: make goldmaster
+    - name: Run Perf Tests
+      run: make run_perf_ci

Package.swift

@@ -30,7 +30,7 @@ let package = Package(
 
         // Changes reside in the xchammer branch
         .package(url: "https://github.com/pinterest/Tulsi.git",
-            .revision("0e17ac96f76a64c014785f9fdf1a49e8bc8dc006")),
+            .revision("0e16c8fb6a65037c30ebe9b896fc308fa3ea1cbd")),
 
         // Note: XcodeGen now transitively depends on this one, so the versions
         // must match!

WORKSPACE

@@ -1,33 +1,47 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
+
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-git_repository(
-    name = "build_bazel_rules_swift",
-    remote = "https://github.com/bazelbuild/rules_swift.git",
-    commit = "0192f16b82b2998d846c45187545e38548a6671a",
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
 )
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
-
-
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -42,13 +56,6 @@ load(
 )
 
 apple_support_dependencies()
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
-
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
 
 ## SPM Dependencies
 

sample/Frankenstein/Makefile

@@ -1,2 +1,2 @@
 deps:
-	tools/bazelwrapper run @rules_pods//:update_pods -- --src_root $$PWD
+	tools/bazelwrapper run @rules_pods//:update_pods -- --src_root $$PWD --trace

sample/Frankenstein/WORKSPACE

@@ -2,31 +2,39 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 
-# Build with changes to add --standalone to test invocation. Additionally, fix
-# several python build issues
+
 http_file(
     name = "xctestrunner",
     executable = 1,
     urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
 )
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-git_repository(
-    name = "build_bazel_rules_swift",
-    remote = "https://github.com/bazelbuild/rules_swift.git",
-    commit = "0192f16b82b2998d846c45187545e38548a6671a",
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
@@ -49,17 +57,12 @@ load(
 )
 
 apple_support_dependencies()
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-fa7a088/PodToBUILD.zip"],
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
 )
 
 # XCHammer resources

sample/Frankenstein/tools/bazelwrapper

@@ -20,11 +20,9 @@ trap exit_trap EXIT
 # Go to bazel release page
 # These are typically posted in groups.google
 # https://groups.google.com/forum/#!forum/bazel-discuss
-BAZEL_VERSION="0.28.1"
-BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
-
-BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 

sample/SnapshotMe/WORKSPACE

@@ -1,33 +1,48 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+
+
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-
-http_archive(
-    name = "build_bazel_rules_swift",
-    urls = [
-        "https://github.com/bazelbuild/rules_swift/releases/download/0.12.1/rules_swift.0.12.1.tar.gz",
-    ],
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
 )
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -42,20 +57,14 @@ load(
 )
 
 apple_support_dependencies()
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
 
-http_file(
-    name = "xctestrunner",
-    executable = 1,
-    urls = ["https://github.com/google/xctestrunner/releases/download/0.2.6/ios_test_runner.par"],
-)
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 http_archive(
     name = "rules_pods",
-    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-4079ca6/PodToBUILD.zip"],
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
 )
 
-
 # XCHammer resources
 # We currently do a binary check-in of XCHammer and need to alias the
 # resources so they can be loaded

sample/SnapshotMe/tools/bazelwrapper

@@ -20,11 +20,9 @@ trap exit_trap EXIT
 # Go to bazel release page
 # These are typically posted in groups.google
 # https://groups.google.com/forum/#!forum/bazel-discuss
-BAZEL_VERSION="0.28.1"
-BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
-
-BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 

sample/Tailor/WORKSPACE

@@ -1,30 +1,48 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
+
+
+http_file(
+    name = "xctestrunner",
+    executable = 1,
+    urls = ["https://github.com/jerrymarino/xctestrunner/files/3453677/ios_test_runner.par.zip"],
+    sha256 = "4e19d47ffe0c248e1cd91cc647557efdf88a7b0e68dba674222c0745e0c0a47b",
+)
+
+
+http_archive(
+    name = "build_bazel_rules_swift",
+    sha256 = "2eb3c54fcbcd366d6cb27ce4b0e2e1876745266e0d077f39516016105f6652a1",
+    strip_prefix = "rules_swift-f51e68960fca1e0e6d594f3d7b519917ec4f988b",
+    url = "https://github.com/bazelbuild/rules_swift/archive/f51e68960fca1e0e6d594f3d7b519917ec4f988b.tar.gz",
+)
+
+http_archive(
+    name = "build_bazel_apple_support",
+    sha256 = "bdbc3f426be3d0fa6489a3b5cb6b7c1af689215a19bfa1abbaaf3cb3280ed58b",
+    strip_prefix = "apple_support-9605c3da1c5bcdddc20d1704b52415a6f3a5f422",
+    url = "https://github.com/bazelbuild/apple_support/archive/9605c3da1c5bcdddc20d1704b52415a6f3a5f422.tar.gz",
+)
 
 git_repository(
     name = "build_bazel_rules_apple",
     remote = "https://github.com/bazelbuild/rules_apple.git",
-    tag = "0.18.0",
+    commit = "f6a95e8d0c2bd6fa9f0a6280ef3c4d34c9594513",
 )
 
 load(
     "@build_bazel_rules_apple//apple:repositories.bzl",
     "apple_rules_dependencies",
 )
-
-git_repository(
-    name = "build_bazel_rules_swift",
-    remote = "https://github.com/bazelbuild/rules_swift.git",
-    commit = "0192f16b82b2998d846c45187545e38548a6671a",
-)
-
 load(
     "@build_bazel_rules_swift//swift:repositories.bzl",
     "swift_rules_dependencies",
 )
 
 swift_rules_dependencies()
 
-apple_rules_dependencies()
+apple_rules_dependencies(ignore_version_differences = True)
 
 load(
     "@com_google_protobuf//:protobuf_deps.bzl",
@@ -40,6 +58,12 @@ load(
 
 apple_support_dependencies()
 
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
+    name = "rules_pods",
+    urls = ["https://github.com/pinterest/PodToBUILD/releases/download/0.25.2-8a5efa0/PodToBUILD.zip"],
+)
 
 # XCHammer resources
 # We currently do a binary check-in of XCHammer and need to alias the
@@ -48,3 +72,4 @@ local_repository(
     name = "xchammer_resources",
     path = "tools/xchammer.app/Contents/Resources",
 )
+

sample/Tailor/tools/bazelwrapper

@@ -20,11 +20,9 @@ trap exit_trap EXIT
 # Go to bazel release page
 # These are typically posted in groups.google
 # https://groups.google.com/forum/#!forum/bazel-discuss
-BAZEL_VERSION="0.28.1"
-BAZEL_VERSION_SHA="5d50ae13ba01a224ddf54cfd818289bee5b38e551cca22bffc79b89f377d2095"
-
-BAZEL_VERSION_URL="https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-darwin-x86_64.sh"
-
+BAZEL_VERSION="2.1.0rc1"
+BAZEL_VERSION_SHA="e1fa6dffc6f4ecb803eca241b017127a567beacea8c425f12858c4e1fe7eecae"
+BAZEL_VERSION_URL="https://releases.bazel.build/2.1.0/rc1/bazel-2.1.0rc1-installer-darwin-x86_64.sh"
 BAZEL_ROOT="$HOME/.bazelenv/versions/$BAZEL_VERSION"
 BAZEL_PATH="$BAZEL_ROOT/bin/bazel"
 

sample/UrlGet/.bazelrc

@@ -12,7 +12,6 @@ build \
     --apple_generate_dsym=false \
     --spawn_strategy=standalone \
     --apple_platform_type=ios \
-    --noincompatible_disallow_load_labels_to_cross_package_boundaries  \
     --incompatible_new_actions_api=false
 
 build:ios_x86_64 \