Skip to content

Commit

Permalink
Directly add NodeSource repo in end-to-end tests, rather than using t…
Browse files Browse the repository at this point in the history
…heir shell script (#1782)
  • Loading branch information
Daniel15 committed Nov 11, 2016
1 parent 86ff2c6 commit 286efb9
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions end_to_end_tests/data/run-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@ fi;
# Add Yarn repo
apt-key adv --fetch-keys http://dl.yarnpkg.com/debian/pubkey.gpg
echo "deb http://nightly.yarnpkg.com/debian/ nightly main" > /etc/apt/sources.list.d/yarn.list
apt-get update -y

if [ "$DISTRIB_RELEASE" == '12.04' -o "$DISTRIB_RELEASE" == '14.04' ]; then
# This is an old Ubuntu version; we need to add the NodeSource repo too
apt-get install curl -y
curl -sL https://deb.nodesource.com/setup_6.x | bash -
# Check if this is an old Ubuntu version that needs the NodeSource repo
if [ "$DISTRIB_RELEASE" == '14.04' ]; then
apt-key adv --fetch-keys http://deb.nodesource.com/gpgkey/nodesource.gpg.key
echo 'deb http://deb.nodesource.com/node_6.x trusty main' > /etc/apt/sources.list.d/nodesource.list
elif [ "$DISTRIB_RELEASE" == '12.04' ]; then
apt-key adv --fetch-keys http://deb.nodesource.com/gpgkey/nodesource.gpg.key
echo 'deb http://deb.nodesource.com/node_6.x precise main' > /etc/apt/sources.list.d/nodesource.list
fi;

apt-get update -y
# TODO: Remove ca-certificates from this list once https://github.com/yarnpkg/yarn/issues/1390 is fixed
apt-get install yarn ca-certificates -y

Expand Down

0 comments on commit 286efb9

Please sign in to comment.