Automated rollback of commit 55f1e58a7a3e77027dd23cf58564424d76ab6dc0.

*** Reason for rollback ***

FreeBSD should work again, so re-enable it.

*** Original change description ***

Remove FreeBSD from our CI temporarily.

RELNOTES: None.
PiperOrigin-RevId: 181140165

scripts/ci/bazel-slow-tests.json

diff --git a/scripts/ci/bazel-slow-tests.json b/scripts/ci/bazel-slow-tests.json
index b603a6c..43f6a46 100644
--- a/scripts/ci/bazel-slow-tests.json
+++ b/scripts/ci/bazel-slow-tests.json
@@ -25,6 +25,8 @@
             {"node": "linux-x86_64"},
             {"node": "ubuntu_16.04-x86_64"},
             {"node": "darwin-x86_64"}
+            // TODO(aehlig): {"node": "freebsd-11"},
+            // TODO(aehlig): {"node": "freebsd-12"},
             // TODO(pcloudy): {"node": "windows-x86_64"},
         ],
         "parameters": {

scripts/ci/bazel-tests.json

diff --git a/scripts/ci/bazel-tests.json b/scripts/ci/bazel-tests.json
index 796d059..62af16f 100644
--- a/scripts/ci/bazel-tests.json
+++ b/scripts/ci/bazel-tests.json
@@ -30,6 +30,32 @@
             "targets": []
         }
     }, {
+        "configurations": [
+            {"node": "freebsd-11"} //,
+            // TODO(aehlig): Fix bazelbuild/continuous-integration#149 and reactivate.
+            // {"node": "freebsd-12"}
+        ],
+        "parameters": {
+            // As configure step, we redo the USES=shebangfix of the devel/bazel
+            // port. In other words, we replace every #!-line calling bash by a
+            // line containing the correct path to bash on our test machines.
+            "configure": [
+                "find -E . -type f -iregex '.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' \\",
+                "-exec sed -i '' \\",
+                "-e '1s|^\\#![[:space:]]*/bin/bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\",
+                "-e '1s|^\\#![[:space:]]*/bin/bash$|\\#!/usr/local/bin/bash|' \\",
+                "-e '1s|^\\#![[:space:]]*/usr/bin/env bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\",
+                "-e '1s|^\\#![[:space:]]*/usr/bin/env bash$|\\#!/usr/local/bin/bash|' \\",
+                "{} +"
+            ],
+            "tests": [
+                "//src/test/shell/integration/...",
+                "let bazel=\"//src/test/shell/bazel/...\" in $bazel - filter(\"all_tests\", $bazel) - filter(\"jdk\", $bazel) - filter(\"maven\", $bazel) - filter(\"android\", $bazel) - filter(\"java\", $bazel) - filter(\"workspace\", $bazel) - filter(\"external\", $bazel) - filter(\"example\", $bazel) - filter(\"skylark_repository\", $bazel) - filter(\"repository_cache\", $bazel)"
+            ],
+            "test_tag_filters": ["-slow"],
+            "targets": []
+        }
+    }, {
         "node": "darwin-x86_64",
         "parameters": {
             "configure": [

scripts/ci/bootstrap.json

diff --git a/scripts/ci/bootstrap.json b/scripts/ci/bootstrap.json
index 9d4244a..bdaa497 100644
--- a/scripts/ci/bootstrap.json
+++ b/scripts/ci/bootstrap.json
@@ -27,6 +27,40 @@
     { "node": "ubuntu_16.04-x86_64", "variation": "" },
     {
         "variation": "",
+        "node": "freebsd-11",
+        "parameters": {
+            "configure": [
+                "find -E . -type f -iregex '.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' \\",
+                "-exec sed -i '' \\",
+                "-e '1s|^\\#![[:space:]]*/bin/bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\",
+                "-e '1s|^\\#![[:space:]]*/bin/bash$|\\#!/usr/local/bin/bash|' \\",
+                "-e '1s|^\\#![[:space:]]*/usr/bin/env bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\",
+                "-e '1s|^\\#![[:space:]]*/usr/bin/env bash$|\\#!/usr/local/bin/bash|' \\",
+                "{} +"
+            ],
+            "archive": {"bazel-bin/src/bazel": "bazel"}
+        },
+        "opts": ["-c opt"]
+    },
+    {
+        "variation": "",
+        "node": "freebsd-12",
+        "parameters": {
+            "configure": [
+                "find -E . -type f -iregex '.*(sh|txt|_stub|stub_.*|bazel|get_workspace_status|protobuf_support|_so)' \\",
+                "-exec sed -i '' \\",
+                "-e '1s|^\\#![[:space:]]*/bin/bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\",
+                "-e '1s|^\\#![[:space:]]*/bin/bash$|\\#!/usr/local/bin/bash|' \\",
+                "-e '1s|^\\#![[:space:]]*/usr/bin/env bash\\([[:space:]]\\)|\\#!/usr/local/bin/bash\\1|' \\",
+                "-e '1s|^\\#![[:space:]]*/usr/bin/env bash$|\\#!/usr/local/bin/bash|' \\",
+                "{} +"
+            ],
+            "archive": {"bazel-bin/src/bazel": "bazel"}
+        },
+        "opts": ["-c opt"]
+    },
+    {
+        "variation": "",
         "node": "darwin-x86_64",
         "parameters": {
             "archive": {

third_party/ijar/BUILD

diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index 90f74c54..45fca3a 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -15,6 +15,9 @@
         "//src:windows": [
             "mapped_file_windows.cc",
         ],
+        "//src:windows_msvc": [
+            "mapped_file_windows.cc",
+        ],
         "//conditions:default": [
             "mapped_file_unix.cc",
         ],
@@ -32,6 +35,10 @@
             "//src/main/cpp/util:errors",
             "//src/main/cpp/util:file",
         ],
+        "//src:windows_msvc": [
+            "//src/main/cpp/util:errors",
+            "//src/main/cpp/util:file",
+        ],
         "//conditions:default": [
         ],
     }),