diff options
| author | Jason Wray <jason@mapbox.com> | 2019-09-19 15:30:12 -0700 |
|---|---|---|
| committer | Jason Wray <friedbunny@users.noreply.github.com> | 2019-09-24 12:24:46 -0700 |
| commit | 183ba62b095b09c0d24b7818fc7735f2a46bac0d (patch) | |
| tree | 95419e482b969acbf2fa99ec61e343e74675f123 | |
| parent | 83a5aae67a6aa07bd6c76f513aacc28d98fe2644 (diff) | |
| download | qtlocation-mapboxgl-183ba62b095b09c0d24b7818fc7735f2a46bac0d.tar.gz | |
[ios, build] Use Ruby 2.6.x for build dependencies on CI
| -rw-r--r-- | circle.yml | 6 | ||||
| -rwxr-xr-x | platform/ios/scripts/install-packaging-dependencies.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/circle.yml b/circle.yml index 4d94619555..c39a4536fe 100644 --- 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 index 134bc6beea..558223bad4 100755 --- 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 |