also take the git hash of the node_modules folder into account

pull/263/head
Fabian Jakobs 2016-02-26 14:12:44 +00:00
rodzic e174f77b26
commit c7a56d59cb
2 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -47,7 +47,7 @@ _b9_package_docker_node_modules() {
local NODE_MODULES
local MODULE
NODE_PATH=$C9_DIR/node_modules:$NODE_PATH $NODEJS $B9_DIR/lib/js/filter_node_modules.js docker --targetFile=$WORKDIR/package.json --source=$SOURCE --settings=$SETTINGS
$NODEJS $B9_DIR/lib/js/filter_node_modules.js docker --targetFile=$WORKDIR/package.json --source=$SOURCE --settings=$SETTINGS
NODE_MODULES=$(cat $WORKDIR/package.json | jq -r '.dependencies | keys | @sh')

Wyświetl plik

@ -46,7 +46,9 @@ _b9_install_deps() {
_b9_setup_node_modules() {
local PACKAGE_FILE=$1
local PACKAGE_PATH=$(dirname $PACKAGE_FILE)
local PACKAGE_MD5=$(cat $PACKAGE_FILE | jq 'del(.version)' | md5sum | awk '{print $1}')
local PACKAGE=$(cat $PACKAGE_FILE | jq 'del(.version)')
local GIT_HASH=$(git log --pretty=oneline -1 -- $PACKAGE_PATH | awk '{ print $1 }')
local PACKAGE_MD5=$(echo "$PACKAGE -- $GIT_HASH" | md5sum | awk '{print $1}')
local CACHE_FILE="npm-${PACKAGE_MD5}.tar.xz"
if [ -e "$TMP/$CACHE_FILE" ] || gsutil cp gs://cloud9_ci_cache/$CACHE_FILE $TMP &> /dev/null; then