[open-ils-commits] [GIT] Evergreen ILS branch master updated. e8164465f5dd0def9ab290b96a265bcb3de5cd1c

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  e8164465f5dd0def9ab290b96a265bcb3de5cd1c (commit)
      from  d58e26fe9262bdc3853030fd5575582bd2a24e04 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8164465f5dd0def9ab290b96a265bcb3de5cd1c
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed May 29 17:39:19 2019 -0400

    LP#1830972: update pin and add comments about keeping things in sync
    
    This patch updates the angular/cli version to ^7.0.7 to match package.json
    and adds comments about keeping the pin in sync between package.json
    and Makefile.common.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json
index 0da357937a..98b52939e5 100644
--- a/Open-ILS/src/eg2/package.json
+++ b/Open-ILS/src/eg2/package.json
@@ -32,6 +32,7 @@
     "rxjs": "^6.4.0",
     "zone.js": "^0.8.29"
   },
+  "//": "NOTE: version of angular/cli should be kept in sync with Open-ILS/src/extras/install/Makefile.common",
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.10.7",
     "@angular/cli": "^7.0.7",
diff --git a/Open-ILS/src/extras/install/Makefile.common b/Open-ILS/src/extras/install/Makefile.common
index 96ec3b8aff..a9a2476218 100644
--- a/Open-ILS/src/extras/install/Makefile.common
+++ b/Open-ILS/src/extras/install/Makefile.common
@@ -32,11 +32,13 @@ install_libdbi:
 		--with-pgsql-libdir=$$(pg_config --libdir) && make all install  
 
 # NOTE: Use the NodeJS Binary
+# ALSO NOTE: the version of angular/cli should be kept in sync with
+#            what's specified in Open-ILS/src/eg2/package.json
 install_nodejs_from_source:
 	wget -N $(NODEJS_BINARY)
 	tar -C /usr/local --strip-components 1 -xJf $(NODEJS_TARBIN)
 	npm update
-	npm install -g @angular/cli
+	npm install -g @angular/cli@^7.0.7
 
 clean:
 	make -C $(LIBDBI) clean

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/eg2/package.json               | 1 +
 Open-ILS/src/extras/install/Makefile.common | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Evergreen ILS