From 2119f41b43d3d76a62207100dc3e78b2d1c9d6fc Mon Sep 17 00:00:00 2001 From: Mikael Lirbank Date: Wed, 28 May 2014 10:18:57 -0700 Subject: [PATCH 1/6] Samver can't be relied on, removing it Fixes https://github.com/oortcloud/heroku-buildpack-meteorite/issues/43 --- bin/compile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index fa07e9335..310297b75 100755 --- a/bin/compile +++ b/bin/compile @@ -82,7 +82,9 @@ if [ "$requested_node_ver" == "" ]; then echo fi -NODE_VERSION=$(curl --silent --get --data-urlencode "range=${requested_node_ver}" https://semver.io/node/resolve) +# samver.io can't be trusted, see https://github.com/oortcloud/heroku-buildpack-meteorite/issues/43 +# NODE_VERSION=$(curl --silent --get --data-urlencode "range=${requested_node_ver}" https://semver.io/node/resolve) +NODE_VERSION=${requested_node_ver} echo "Using Node.js version: ${NODE_VERSION}" | indent # vendor directories From 26dabe41eab13474a2dcc0a277f5ccd50b8d03f2 Mon Sep 17 00:00:00 2001 From: Mikael Lirbank Date: Wed, 28 May 2014 10:18:57 -0700 Subject: [PATCH 2/6] Samver can't be relied on, removing it Fixes https://github.com/oortcloud/heroku-buildpack-meteorite/issues/43 --- bin/compile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/compile b/bin/compile index 5a785afaa..c0a7dad6b 100755 --- a/bin/compile +++ b/bin/compile @@ -82,7 +82,9 @@ if [ "$requested_node_ver" == "" ]; then echo fi -NODE_VERSION=$(curl --silent --get --data-urlencode "range=${requested_node_ver}" https://semver.io/node/resolve) +# samver.io can't be trusted, see https://github.com/oortcloud/heroku-buildpack-meteorite/issues/43 +# NODE_VERSION=$(curl --silent --get --data-urlencode "range=${requested_node_ver}" https://semver.io/node/resolve) +NODE_VERSION=${requested_node_ver} echo "Using Node.js version: ${NODE_VERSION}" | indent # vendor directories From c95a1d85bb1799fb7d0ddd6c4a4bdb3715a44491 Mon Sep 17 00:00:00 2001 From: Mikael Lirbank Date: Sun, 31 Aug 2014 11:30:19 -0700 Subject: [PATCH 3/6] Removing mrt --- bin/compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index c0a7dad6b..c7add6663 100755 --- a/bin/compile +++ b/bin/compile @@ -125,8 +125,8 @@ VENDORED_METEOR="$(mktmpdir meteor)" curl https://install.meteor.com | HOME="$VENDORED_METEOR" /bin/sh | indent echo "Meteor installed" | indent -echo "Installing packages" | indent -HOME="$BUILD_DIR" mrt install --force | indent +#echo "Installing packages" | indent +#HOME="$BUILD_DIR" mrt install --force | indent echo "Building meteor bundle" | indent HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent From ca19c466c7724dafab2136f33a74720bcca0fab0 Mon Sep 17 00:00:00 2001 From: Mikael Lirbank Date: Sun, 31 Aug 2014 11:37:28 -0700 Subject: [PATCH 4/6] Removing mrt --- bin/compile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/compile b/bin/compile index c7add6663..02c6bfd35 100755 --- a/bin/compile +++ b/bin/compile @@ -108,8 +108,8 @@ export CPPPATH="$INCLUDE_PATH" ############################################ echo "-----> Installing meteorite with npm" -run_npm "install meteorite -g" -echo "Meteorite installed" | indent +# run_npm "install meteorite -g" +# echo "Meteorite installed" | indent METEOR_BUILD_DIR="$BUILD_DIR/.meteor/heroku_build" mkdir -p "$HOME" From f284199d12196243115acca30a0d72906785d64b Mon Sep 17 00:00:00 2001 From: Mikael Lirbank Date: Sun, 31 Aug 2014 11:56:11 -0700 Subject: [PATCH 5/6] Removing mrt --- bin/compile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/bin/compile b/bin/compile index 02c6bfd35..4f966a92e 100755 --- a/bin/compile +++ b/bin/compile @@ -106,11 +106,6 @@ export CPPPATH="$INCLUDE_PATH" ############################################ # install meteorite ############################################ -echo "-----> Installing meteorite with npm" - -# run_npm "install meteorite -g" -# echo "Meteorite installed" | indent - METEOR_BUILD_DIR="$BUILD_DIR/.meteor/heroku_build" mkdir -p "$HOME" ############################################ @@ -125,8 +120,6 @@ VENDORED_METEOR="$(mktmpdir meteor)" curl https://install.meteor.com | HOME="$VENDORED_METEOR" /bin/sh | indent echo "Meteor installed" | indent -#echo "Installing packages" | indent -#HOME="$BUILD_DIR" mrt install --force | indent echo "Building meteor bundle" | indent HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent From e6a652c11721b8ac7d373ae4fc12fafba67765f1 Mon Sep 17 00:00:00 2001 From: Mikael Lirbank Date: Wed, 12 Nov 2014 18:12:06 -0800 Subject: [PATCH 6/6] Add AWS SDK --- bin/compile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/compile b/bin/compile index 4f966a92e..0ce7d0ab8 100755 --- a/bin/compile +++ b/bin/compile @@ -102,6 +102,10 @@ export npm_config_prefix="$VENDORED_MODULES" export CPATH="$INCLUDE_PATH" export CPPPATH="$INCLUDE_PATH" +############################################ +# install AWS SDK +############################################ +npm install aws-sdk ############################################ # install meteorite