Merge branch 'master' into prism

Author: egiurleo

.bazelrc

@@ -91,7 +91,6 @@ build:dbg-linux --config=dbg --platforms=@//tools/platforms:linux_x86_64
 build:release-common --define release=true
 build:release-common --compilation_mode=opt
 build:release-common --config=backtracesymbols
-build:release-common --config=static-libs
 build:release-common --config=versioned
 
 build:release-debug-common --config=forcedebug
@@ -111,9 +110,11 @@ build:untyped-blame --copt=-DTRACK_UNTYPED_BLAME_MODE
 # harden: mark relocation sections read-only
 build:release-linux --linkopt=-Wl,-z,relro,-z,now
 build:release-linux --config=lto-linux --config=release-common
+build:release-linux --config=static-libs
 # Separate config for aarch64, so x86_64 can be differently optimized
 build:release-linux-aarch64 --linkopt=-Wl,-z,relro,-z,now
 build:release-linux-aarch64 --config=lto-linux --config=release-common
+build:release-linux-aarch64 --config=static-libs
 
 # It would be nice to move this back to release-common, but there is a build
 # failure when using clang 15 on macOS to build GNU make via rules_foreign_cc:
@@ -136,7 +137,15 @@ build:release-linux           --copt=-march=sandybridge
 build:release-sanitized-linux --copt=-march=sandybridge
 build:release-linux-aarch64   --copt=-march=armv8.1a
 
-build:release-mac --config=release-common --platforms=@//tools/platforms:darwin_x86_64
+build:release-mac --config=release-common --config=shared-libs
+
+build:cross-to-darwin-x86_64 --platforms=@//tools/platforms:darwin_x86_64
+build:cross-to-darwin-x86_64 --extra_toolchains=@llvm_toolchain_15_0_7//:cc-toolchain-x86_64-darwin
+build:cross-to-darwin-x86_64 --copt=-stdlib=libc++ --linkopt=-lc++
+
+build:cross-to-darwin-arm64 --platforms=@//tools/platforms:darwin_arm64
+build:cross-to-darwin-arm64 --extra_toolchains=@llvm_toolchain_15_0_7//:cc-toolchain-aarch64-darwin
+build:cross-to-darwin-arm64 --copt=-stdlib=libc++ --linkopt=-lc++
 
 build:release-debug-linux --config=release-linux
 build:release-debug-linux --config=release-debug-common

.bazelversion_checksums/darwin-arm64

@@ -0,0 +1 @@
+c2b5f82dcc1561d25bc05c734a7cc7a5ff58d4e69185f3d6d21b51ddb53b488b

.bazelversion_checksums/darwin-x86_64

@@ -0,0 +1 @@
+455589bbaedf26e7bdb949288f777492ba1c53d67fd8329bfe066fb988df0e5c

.bazelversion_checksums/linux-arm64

@@ -0,0 +1 @@
+5afe973cadc036496cac66f1414ca9be36881423f576db363d83afc9084c0c2f

.bazelversion_checksums/linux-x86_64

@@ -0,0 +1 @@
+c0161a346b9c0d00e6eb3d3e8f9c4dece32f6292520248c5ab2e3527265601c1

.buildkite/build-static-release.sh

@@ -30,8 +30,27 @@ echo will run with $CONFIG_OPTS
 
 ./bazel build //main:sorbet --strip=always $CONFIG_OPTS
 
+if [ "$kernel_name" != "darwin" ]; then
+  cp bazel-bin/main/sorbet sorbet_bin
+else
+  cp bazel-bin/main/sorbet "sorbet.$platform"
+
+  # TODO(jez) building on arm64 is not tested (no arm64 mac buildkite instances)
+  case "$processor_name" in
+    x86_64) cross_target=darwin-arm64  ;;
+    arm64)  cross_target=darwin-x86_64 ;;
+  esac
+
+  ./bazel build //main:sorbet --strip=always "$CONFIG_OPTS" --config="cross-to-$cross_target"
+  cp bazel-bin/main/sorbet "sorbet.$cross_target"
+
+  # TODO(jez) We might be able to replace this with `apple_universal_binary`?
+  # https://github.com/bazelbuild/rules_apple/blob/35a2fb854a47745deb035d3443008aa15a2c2b85/doc/rules-apple.md#apple_universal_binary
+  lipo -create -output sorbet_bin sorbet.darwin-*
+fi
+
 mkdir gems/sorbet-static/libexec/
-cp bazel-bin/main/sorbet gems/sorbet-static/libexec/
+cp sorbet_bin gems/sorbet-static/libexec/sorbet
 
 rbenv install --skip-existing
 
@@ -110,5 +129,15 @@ if [[ "$platform" == "linux-x86_64" ]]; then
   mv gems/sorbet/sorbet*.gem _out_/gems/
 fi
 
-mkdir -p _out_/$platform
-cp bazel-bin/main/sorbet _out_/$platform/
+if [ "$kernel_name" = "darwin" ]; then
+  mkdir -p _out_/darwin-universal
+  mv sorbet_bin _out_/darwin-universal/sorbet
+
+  for plat in {darwin-x86_64,darwin-arm64}; do
+    mkdir -p "_out_/$plat"
+    mv "sorbet.$plat" "_out_/$plat/sorbet"
+  done
+else
+  mkdir -p "_out_/$platform"
+  mv sorbet_bin "_out_/$platform/sorbet"
+fi

.buildkite/pipeline.yaml

@@ -7,7 +7,7 @@ steps:
 
 # Basic Phase - Run super fast things and things that commonly catch bugs
   - label: ":linux: linters.sh"
-    command: .buildkite/linters.sh
+    command: '.buildkite/linters.sh < /dev/null'
     <<: &elastic
       agents:
         os: linux
@@ -29,7 +29,7 @@ steps:
               - "/usr/local/var/bazelcache:/usr/local/var/bazelcache"
 
   - label: ":mac: test-static-sanitized.sh (master only)"
-    command: .buildkite/test-static-sanitized.sh
+    command: '.buildkite/test-static-sanitized.sh < /dev/null'
     branches: "master"
     artifact_paths: _out_/profile.json
     agents:
@@ -40,35 +40,35 @@ steps:
      automatic: true
 
   - label: ":linux: test-static-sanitized.sh"
-    command: .buildkite/test-static-sanitized.sh
+    command: '.buildkite/test-static-sanitized.sh < /dev/null'
     artifact_paths: _out_/profile.json
     <<: *elastic
 
   - label: ":linux: test-rbi-gen.sh"
-    command: .buildkite/test-rbi-gen.sh
+    command: '.buildkite/test-rbi-gen.sh < /dev/null'
     artifact_paths:
       - _out_/profile.json
     <<: *elastic
 
   - label: ":linux: test-vscode-extension.sh"
-    command: '.buildkite/test-vscode-extension.sh'
+    command: '.buildkite/test-vscode-extension.sh < /dev/null'
     <<: *elastic
 
   - wait: ~
 
 # Build Phase - Build all our artifacts
   - label: ":linux: build-website.sh"
-    command: .buildkite/build-website.sh
+    command: '.buildkite/build-website.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
 
   - label: ":linux: build-sorbet-runtime.sh"
-    command: .buildkite/build-sorbet-runtime.sh
+    command: '.buildkite/build-sorbet-runtime.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
 
   - label: ":mac: build-static-release.sh (master only)"
-    command: .buildkite/build-static-release.sh
+    command: '.buildkite/build-static-release.sh < /dev/null'
     branches: master
     artifact_paths: _out_/**/*
     agents:
@@ -79,37 +79,37 @@ steps:
      automatic: true
 
   - label: ":linux: build-static-release.sh"
-    command: .buildkite/build-static-release.sh
+    command: '.buildkite/build-static-release.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
 
   - label: ":linux: (arm64) build-static-release.sh"
-    command: .buildkite/build-static-release.sh
+    command: '.buildkite/build-static-release.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
     agents:
       os: linux
       queue: elastic-arm64
 
   - label: ":linux: build-sorbet-static-and-runtime.sh"
-    command: .buildkite/build-sorbet-static-and-runtime.sh
+    command: '.buildkite/build-sorbet-static-and-runtime.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
 
   - label: ":linux: build-emscripten.sh"
-    command: .buildkite/build-emscripten.sh
+    command: '.buildkite/build-emscripten.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
 
   - label: ":linux: build-vscode-extension.sh"
-    command: .buildkite/build-vscode-extension.sh
+    command: '.buildkite/build-vscode-extension.sh < /dev/null'
     artifact_paths: _out_/**/*
     <<: *elastic
 
   - wait: ~
 
   - label: ":linux: build-static-release-java.sh (master only)"
-    command: .buildkite/build-static-release-java.sh
+    command: '.buildkite/build-static-release-java.sh < /dev/null'
     # this needs to be run when both linux & mac build-static-release
     # are done. at the moment, mac is only done on master branch
     branches: master
@@ -120,17 +120,17 @@ steps:
 
 # Deploy Phase - Send the artifacts to the world
   - label: ":linux: publish.sh"
-    command: .buildkite/publish.sh
+    command: '.buildkite/publish.sh'
     agents:
       os: linux
   - wait: ~
 
 # Success Phase - Allow the PR to be merged
   - label: "All tests and builds succeeded"
-    command: .buildkite/all-succeeded.sh
+    command: '.buildkite/all-succeeded.sh'
 
   - label: ":linux: publish-ruby-gems.sh (non-blocking)"
-    command: .buildkite/publish-ruby-gems.sh
+    command: '.buildkite/publish-ruby-gems.sh < /dev/null'
     artifact_paths: _out_/corrupt/**/*
     <<: *elastic
 

WORKSPACE

@@ -42,6 +42,12 @@ llvm_toolchain(
         "https://github.com/sorbet/llvm-project/releases/download/llvmorg-{llvm_version}/{basename}",
     ],
     llvm_version = "15.0.7",
+    # The sysroots are needed for cross-compiling
+    sysroot = {
+        "": "",
+        "darwin-x86_64": "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
+        "darwin-aarch64": "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
+    },
 )
 
 load("@llvm_toolchain_15_0_7//:toolchains.bzl", "llvm_register_toolchains")
@@ -104,13 +110,3 @@ bazel_skylib_workspace()
 load("@aspect_bazel_lib//lib:repositories.bzl", "aspect_bazel_lib_dependencies")
 
 aspect_bazel_lib_dependencies()
-
-BAZEL_INSTALLER_VERSION_LINUX_X86_64_SHA = "c0161a346b9c0d00e6eb3d3e8f9c4dece32f6292520248c5ab2e3527265601c1"
-
-# Bazel for linux-arm64 doesn't have an installer at the moment.
-# We have a workaround in `./bazel` to download the binary directly.
-BAZEL_INSTALLER_VERSION_LINUX_ARM64_SHA = "5afe973cadc036496cac66f1414ca9be36881423f576db363d83afc9084c0c2f"
-
-BAZEL_INSTALLER_VERSION_DARWIN_X86_64_SHA = "455589bbaedf26e7bdb949288f777492ba1c53d67fd8329bfe066fb988df0e5c"
-
-BAZEL_INSTALLER_VERSION_DARWIN_ARM64_SHA = "c2b5f82dcc1561d25bc05c734a7cc7a5ff58d4e69185f3d6d21b51ddb53b488b"