Skip to content

Commit

Permalink
Remove support for macOS Mojave 10.14 (RobotLocomotion#14352)
Browse files Browse the repository at this point in the history
* Remove support for macOS Mojave 10.14
  • Loading branch information
jamiesnape authored Nov 17, 2020
1 parent 307b252 commit 54b93b6
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ set(UNIX_DISTRIBUTION_ID)
set(UNIX_DISTRIBUTION_CODENAME)

if(APPLE)
if(CMAKE_SYSTEM_VERSION VERSION_LESS 18)
if(CMAKE_SYSTEM_VERSION VERSION_LESS 19)
message(FATAL_ERROR
"Darwin ${CMAKE_SYSTEM_VERSION} is NOT supported. Please use Darwin "
"18.x (macOS Mojave) or Darwin 19.x (macOS Catalina)."
"Darwin 19.x (macOS Catalina)."
)
endif()
else()
Expand Down
10 changes: 4 additions & 6 deletions doc/developers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,8 @@ Drake requires a compiler running in C++17 mode.
| Ubuntu 20.04 LTS (Focal Fossa) | | 3.16 | | GCC 9.3 (default) | | 3.8 |
| | | | | Clang 9 | | |
+----------------------------------+ +-------+---------------------+-------------------+ |
| macOS Mojave (10.14) | | 3.17 | | Apple LLVM 11.0.0 | | AdoptOpenJDK 14 | |
| | | | | (Xcode 11.3) | | (HotSpot JVM) | |
+----------------------------------+ | +---------------------+ | |
| macOS Catalina (10.15) | | | | Apple LLVM 12.0.0 | | |
| | | | | (Xcode 12.0) | | |
| macOS Catalina (10.15) | | 3.18 | | Apple LLVM 12.0.0 | | AdoptOpenJDK 15 | |
| | | | | (Xcode 12.2) | | (HotSpot JVM) | |
+----------------------------------+-------+-------+---------------------+-------------------+--------+

CPython is the only Python implementation supported. On Ubuntu, amd64
Expand Down Expand Up @@ -126,7 +123,8 @@ Binary Packages
---------------

The binary releases of Drake are built with GCC 7.5 on Ubuntu 18.04 (Bionic),
GCC 9.3 on Ubuntu 20.04 (Focal), and Apple LLVM 11.0.0 on macOS Mojave.
GCC 9.3 on Ubuntu 20.04 (Focal), and Apple LLVM 12.0.0 on macOS Catalina
(10.15).

The links for these packages are listed in :ref:`binary-installation`.

Expand Down
4 changes: 2 additions & 2 deletions doc/jenkins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ comment on an open pull request as follows:

* ``@drake-jenkins-bot linux-bionic-unprovisioned-gcc-bazel-experimental-snopt-packaging please``
* ``@drake-jenkins-bot linux-focal-unprovisioned-gcc-bazel-experimental-snopt-packaging please``
* ``@drake-jenkins-bot mac-mojave-unprovisioned-clang-bazel-experimental-snopt-packaging please``
* ``@drake-jenkins-bot mac-catalina-unprovisioned-clang-bazel-experimental-snopt-packaging please``

or follow the :ref:`instructions above <scheduling-builds-via-the-jenkins-user-interface>`
to schedule a build of one of the following jobs from the Jenkins user
interface:

* linux-bionic-unprovisioned-gcc-bazel-experimental-snopt-packaging
* linux-focal-unprovisioned-gcc-bazel-experimental-snopt-packaging
* mac-mojave-unprovisioned-clang-bazel-experimental-snopt-packaging
* mac-catalina-unprovisioned-clang-bazel-experimental-snopt-packaging

The URL from which to download the built package will be indicated in the
Jenkins console log for the completed build, for example::
Expand Down
4 changes: 2 additions & 2 deletions doc/release_playbook.rst
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ Cutting the release
has nothing still running (modulo the ``*-coverage`` builds, which we can
ignore)
c. Take
https://drake-jenkins.csail.mit.edu/view/Packaging/job/mac-mojave-unprovisioned-clang-bazel-nightly-snopt-packaging/
https://drake-jenkins.csail.mit.edu/view/Packaging/job/mac-catalina-unprovisioned-clang-bazel-nightly-snopt-packaging/
and
https://drake-jenkins.csail.mit.edu/view/Packaging/job/linux-bionic-unprovisioned-gcc-bazel-nightly-snopt-packaging/
and
Expand All @@ -131,7 +131,7 @@ Cutting the release

a. Make a local folder, maybe ``$HOME/tmp/v0.N.0``
b. Fetch all the things (
https://drake-jenkins.csail.mit.edu/view/Packaging/job/mac-mojave-unprovisioned-clang-bazel-nightly-snopt-packaging/
https://drake-jenkins.csail.mit.edu/view/Packaging/job/mac-catalina-unprovisioned-clang-bazel-nightly-snopt-packaging/
and
https://drake-jenkins.csail.mit.edu/view/Packaging/job/linux-bionic-unprovisioned-gcc-bazel-nightly-snopt-packaging/
and
Expand Down
2 changes: 1 addition & 1 deletion tools/workspace/os.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ def _determine_macos(repository_ctx):
macos_release = ".".join(major_minor_versions)

# Match supported macOS release(s).
if macos_release in ["10.14", "10.15"]:
if macos_release in ["10.15"]:
return _make_result(macos_release = macos_release)

# Nothing matched.
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/pkg_config.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -147,12 +147,12 @@ def setup_pkg_config_repository(repository_ctx):
# Blacklist various system include paths on macOS.
blacklisted_includes = [
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include", # noqa
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.14.sdk/usr/include", # noqa
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk/usr/include", # noqa
"/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/usr/include", # noqa
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include", # noqa
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include",
"/Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk/usr/include",
"/Library/Developer/CommandLineTools/SDKs/MacOSX10.15.sdk/usr/include",
"/Library/Developer/CommandLineTools/SDKs/MacOSX11.0.sdk/usr/include",
"/Library/Developer/CommandLineTools/usr/include",
]

Expand Down

0 comments on commit 54b93b6

Please sign in to comment.