[ios, build] Use Ruby 2.6.x for build dependencies on CI

mapbox · Sep 24, 2019 · 183ba62 · 183ba62
1 parent 83a5aae
commit 183ba62
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/circle.yml b/circle.yml
@@ -560,7 +560,9 @@ commands:
     steps:
     - run:
         name: Install iOS packaging dependencies
-        command: ./platform/ios/scripts/install-packaging-dependencies.sh
+        command: |
+          echo "ruby-2.6" > ~/.ruby-version
+          ./platform/ios/scripts/install-packaging-dependencies.sh
         background: true
 
   install-macos-dependencies:
@@ -1390,6 +1392,7 @@ jobs:
   ios-release-template:
     macos:
       xcode: "10.3.0"
+    shell: /bin/bash --login -eo pipefail
     environment:
       BUILDTYPE: Release
       HOMEBREW_NO_AUTO_UPDATE: 1
@@ -1438,6 +1441,7 @@ jobs:
   ios-release-tag:
     macos:
       xcode: "10.3.0"
+    shell: /bin/bash --login -eo pipefail
     environment:
       BUILDTYPE: Release
       HOMEBREW_NO_AUTO_UPDATE: 1

diff --git a/platform/ios/scripts/install-packaging-dependencies.sh b/platform/ios/scripts/install-packaging-dependencies.sh
@@ -48,7 +48,7 @@ if [[ -z `which jazzy` || $(jazzy -v) != "jazzy version: ${JAZZY_VERSION}" ]]; t
     step "Installing jazzy…"
 
     if [[ "${CIRCLECI}" == true ]]; then
-        sudo gem install jazzy -v $JAZZY_VERSION --no-document -- --with-sqlite3-lib=/usr/lib
+        sudo gem install jazzy -v $JAZZY_VERSION --no-document
     else
         gem install jazzy -v $JAZZY_VERSION --no-document
     fi