From 501b6384494660d151c95d37a684e490c4ace2f5 Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Wed, 18 Jul 2018 11:31:51 -0500 Subject: [PATCH] Add npm ci to build-all to prevent mistakenly non-updated asset builds - REQUIRES DOCKER IMAGE REBUILD --- package.json | 2 +- script/debian_setup.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d20c0311..d42eff0d 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "scripts": { "watch": "export HOUDINI_WATCH=1; script/build.sh", "build": "script/build.sh", - "build-all": "script/compile-assets.sh && npm run build", + "build-all": "npm ci && script/compile-assets.sh && npm run build", "test": "rake spec && npm run build && npx jest", "export-button-config": "bundle exec rake settings:generate_json", "export-i18n": "bundle exec rake settings:combine_translations", diff --git a/script/debian_setup.sh b/script/debian_setup.sh index eaf16acf..5839d3b7 100755 --- a/script/debian_setup.sh +++ b/script/debian_setup.sh @@ -4,4 +4,5 @@ set -e curl -sL https://deb.nodesource.com/setup_9.x | bash - echo 'deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main' > /etc/apt/sources.list.d/pgdg.list wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - -apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs postgresql-9.6 default-jre \ No newline at end of file +apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs postgresql-9.6 default-jre +npm install npm@^6 -g \ No newline at end of file