From a0d74241db4885d5c2ad8132697d4de6093c5aec Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 16 Oct 2019 15:52:05 -0400 Subject: [PATCH 1/3] Upgrade to xcode 9.3 in nightly builds [skip ci] --- dev/tasks/gandiva-jars/travis.osx.yml | 2 +- dev/tasks/homebrew-formulae/travis.osx.r.yml | 1 + dev/tasks/homebrew-formulae/travis.osx.yml | 1 + dev/tasks/python-wheels/travis.osx.yml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 3d5ea0b9117..88ffa36ee72 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode8.3 +osx_image: xcode9.3 sudo: required language: cpp compiler: clang diff --git a/dev/tasks/homebrew-formulae/travis.osx.r.yml b/dev/tasks/homebrew-formulae/travis.osx.r.yml index bc2f53dfb90..fb39c9abd81 100644 --- a/dev/tasks/homebrew-formulae/travis.osx.r.yml +++ b/dev/tasks/homebrew-formulae/travis.osx.r.yml @@ -15,6 +15,7 @@ # limitations under the License. os: osx +osx_image: xcode9.3 language: r cache: packages r: {{ r_version }} diff --git a/dev/tasks/homebrew-formulae/travis.osx.yml b/dev/tasks/homebrew-formulae/travis.osx.yml index 8b23d7c767a..48454a8a89e 100644 --- a/dev/tasks/homebrew-formulae/travis.osx.yml +++ b/dev/tasks/homebrew-formulae/travis.osx.yml @@ -15,6 +15,7 @@ # limitations under the License. os: osx +osx_image: xcode9.3 language: ruby cache: bundler diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index ec3e97d2fe9..21438a9bf5b 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode8.3 +osx_image: xcode9.3 language: generic # don't build twice From dd3748bdc99a272375a7103b1a2f220803e2a966 Mon Sep 17 00:00:00 2001 From: Neal Richardson Date: Wed, 16 Oct 2019 16:35:35 -0400 Subject: [PATCH 2/3] Try xcode 9.2 [skip ci] --- dev/tasks/gandiva-jars/travis.osx.yml | 2 +- dev/tasks/homebrew-formulae/travis.osx.r.yml | 2 +- dev/tasks/homebrew-formulae/travis.osx.yml | 2 +- dev/tasks/python-wheels/travis.osx.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev/tasks/gandiva-jars/travis.osx.yml b/dev/tasks/gandiva-jars/travis.osx.yml index 88ffa36ee72..e6675ffaf66 100644 --- a/dev/tasks/gandiva-jars/travis.osx.yml +++ b/dev/tasks/gandiva-jars/travis.osx.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode9.3 +osx_image: xcode9.2 sudo: required language: cpp compiler: clang diff --git a/dev/tasks/homebrew-formulae/travis.osx.r.yml b/dev/tasks/homebrew-formulae/travis.osx.r.yml index fb39c9abd81..e9c2c9b3aed 100644 --- a/dev/tasks/homebrew-formulae/travis.osx.r.yml +++ b/dev/tasks/homebrew-formulae/travis.osx.r.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode9.3 +osx_image: xcode9.2 language: r cache: packages r: {{ r_version }} diff --git a/dev/tasks/homebrew-formulae/travis.osx.yml b/dev/tasks/homebrew-formulae/travis.osx.yml index 48454a8a89e..0fa84551ab6 100644 --- a/dev/tasks/homebrew-formulae/travis.osx.yml +++ b/dev/tasks/homebrew-formulae/travis.osx.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode9.3 +osx_image: xcode9.2 language: ruby cache: bundler diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index 21438a9bf5b..13a52b179da 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -15,7 +15,7 @@ # limitations under the License. os: osx -osx_image: xcode9.3 +osx_image: xcode9.2 language: generic # don't build twice From dc4e9c9c9d4907c469dce3dd057cd24acdc4daeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Sz=C5=B1cs?= Date: Thu, 17 Oct 2019 09:22:13 -0400 Subject: [PATCH 3/3] reinstall openssl@1.1 for travis deployment [skip ci] --- dev/tasks/python-wheels/travis.osx.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tasks/python-wheels/travis.osx.yml b/dev/tasks/python-wheels/travis.osx.yml index 13a52b179da..a489f54f05d 100644 --- a/dev/tasks/python-wheels/travis.osx.yml +++ b/dev/tasks/python-wheels/travis.osx.yml @@ -81,7 +81,7 @@ install: # move built wheels to a top level directory - mv -v arrow/python/dist/* dist/ # reinstall openssl because travis' deployment script depends on it - - brew install openssl + - brew install openssl@1.1 deploy: provider: releases