-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Udpate way to calculate absolute path in install-deps * Use rvm head * Update condition * Remove manual openssl * Remove openssl 1.1 installation for old versions
- Loading branch information
1 parent
93b5b48
commit bf9eeb6
Showing
3 changed files
with
9 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,11 +2,11 @@ | |
|
||
PARAM_RUBY_VERSION=$(eval echo "${PARAM_VERSION}") | ||
RUBY_VERSION_MAJOR=$(echo "$PARAM_VERSION" | cut -d. -f1) | ||
RUBY_VERSION_MINOR=$(echo "$PARAM_VERSION" | cut -d. -f2) | ||
detected_platform="$(uname -s | tr '[:upper:]' '[:lower:]')" | ||
if [ "$detected_platform" = "darwin" ] && [ "$RUBY_VERSION_MAJOR" -le 2 ]; then | ||
brew install [email protected] | ||
OPENSSL_LOCATION="$(brew --prefix [email protected])" | ||
export RUBY_CONFIGURE_OPTS="--with-openssl-dir=$OPENSSL_LOCATION" | ||
|
||
# When on MacOS, and versions minor or equal to 3.0.x. These are the versions depending on OpenSSL 1.1 | ||
if [[ "$detected_platform" = "darwin" && ( "$RUBY_VERSION_MAJOR" -le 2 || ( "$RUBY_VERSION_MAJOR" -eq 3 && "$RUBY_VERSION_MINOR" -eq 0 ) ) ]]; then | ||
rbenv install $PARAM_RUBY_VERSION | ||
rbenv global $PARAM_RUBY_VERSION | ||
exit 0 | ||
|
@@ -21,7 +21,7 @@ elif ! openssl version | grep -q -E '1\.[0-9]+\.[0-9]+'; then | |
# location of RVM is expected to be available at RVM_HOME env var | ||
WITH_OPENSSL="--with-openssl-dir=$RVM_HOME/usr" | ||
fi | ||
|
||
rvm get master | ||
rvm install "$PARAM_RUBY_VERSION" "$WITH_OPENSSL" | ||
rvm use "$PARAM_RUBY_VERSION" | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters