Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enable darwin for the node installation in the CI #51705

Merged
merged 7 commits into from
Feb 3, 2020
Merged

enable darwin for the node installation in the CI #51705

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5a5c024
enable darwin for the node installation in the CI
v1v Nov 26, 2019
fc48962
Merge branch 'master' into feature/support-darwin-in-ci
elasticmachine Dec 5, 2019
003a361
refactor: avoid hardcode strings and customise based on the OS flavour
v1v Dec 9, 2019
d5ca114
Merge branch 'master' into feature/support-darwin-in-ci
elasticmachine Jan 7, 2020
a19ad3b
Merge remote-tracking branch 'upstream/master' into feature/support-d…
v1v Feb 3, 2020
0763b9c
fix classifier
v1v Feb 3, 2020
b5d8ea5
Merge branch 'feature/support-darwin-in-ci' of github.com:v1v/kibana …
v1v Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/dev/ci_setup/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,23 +56,23 @@ export KIBANA_PKG_BRANCH="$kbnBranch"
###
### download node
###
nodeVersion="$(cat "$dir/.node-version")"
nodeDir="$cacheDir/node/$nodeVersion"
nodeBin="$nodeDir/bin"
classifier="x64.tar.gz"

UNAME=$(uname)
OS="linux"
if [[ "$UNAME" = *"MINGW64_NT"* ]]; then
OS="win"
nodeBin="$HOME/node"
classifier="x64.zip"
elif [[ "$UNAME" == "Darwin" ]]; then
OS="darwin"
fi
echo " -- Running on OS: $OS"

nodeVersion="$(cat "$dir/.node-version")"
nodeDir="$cacheDir/node/$nodeVersion"

if [[ "$OS" == "win" ]]; then
nodeBin="$HOME/node"
nodeUrl="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v$nodeVersion/node-v$nodeVersion-win-x64.zip"
else
nodeBin="$nodeDir/bin"
nodeUrl="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v$nodeVersion/node-v$nodeVersion-linux-x64.tar.gz"
fi
nodeUrl="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v$nodeVersion/node-v$nodeVersion-${OS}-${classifier}"

if [[ "$installNode" == "true" ]]; then
echo " -- node: version=v${nodeVersion} dir=$nodeDir"
Expand Down