Merge pull request #86 from urbanriskmap/dev

Merge dev to prepare new release (v3.0.6)

.travis.yml

@@ -1,44 +1,73 @@
 dist: trusty
 language: node_js
 node_js:
-   - "8.1.4"
+   - "8.9.3"
 sudo: true
 
-notifications:
-  slack: miturbanrisklab:4y7wfdHde8dtfb00wTfNZfTA
-
-addons:
-  postgresql: "9.5"
-  apt:
-    packages:
-      - postgresql-9.5-postgis-2.3
-
 branches:
   only:
     - master
     - dev
     - server-object-refactor
     - report-archive
 
+notifications:
+  slack: miturbanrisklab:4y7wfdHde8dtfb00wTfNZfTA
+
+addons:
+  postgresql: "10"
+  apt:
+    packages:
+      - postgresql-10-postgis-2.4
+      - proj-bin
+      - postgresql-10-postgis-2.4-scripts
+
 before_install:
+  - sudo cp /etc/postgresql/9.6/main/pg_hba.conf /etc/postgresql/10/main/pg_hba.conf
+  - sudo /etc/init.d/postgresql restart
+  - export PGPORT=5433
   - npm i -g [email protected]
   - if [[ $TRAVIS_BRANCH != 'master' ]]; then BRANCH='dev'; else BRANCH='master'; fi;
   - export PGDATABASE=cognicity_server_testing ; git clone -b $BRANCH https://github.com/urbanriskmap/cognicity-schema.git urbanriskmap/cognicity-schema && cd urbanriskmap/cognicity-schema && bash build/run.sh && cd -
 
 install:
   - npm install
 
-after_success: npm run coverage 
+after_success: npm run coverage
 
 before_deploy:
-  - npm run jsdoc && cd jsdoc
+  - npm run jsdoc
+  - npm run build && zip -r dist.zip . -x "*node_modules*" "*.git*" "*src*" "*jsdoc*"
 
 deploy: #build the docs for dev branch only
-  provider: s3
-  bucket: "dev-cognicity-server-docs"
-  region: "us-east-1"
-  access_key_id: $AWS_S3_ACCESS_KEY_ID
-  secret_access_key: $AWS_S3_SECRET_ACCESS_KEY
-  skip_cleanup: true
-  on:
-    branch: dev
+  - provider: s3
+    bucket: "dev-cognicity-server-docs"
+    region: "us-east-1"
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    skip_cleanup: true
+    local_dir: jsdoc
+    on:
+      branch: dev
+  - provider: elasticbeanstalk # deploy the dev us server
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    region: $AWS_EB_REGION_US
+    app: $AWS_EB_APP_US
+    env: $AWS_EB_APP_ENV_US_DEV
+    bucket_name: $AWS_EB_APP_BUCKET_US_DEV
+    skip_cleanup: true
+    zip_file: dist.zip
+    on:
+      branch: dev
+  - provider: elasticbeanstalk # deploy the dev us server
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    region: $AWS_EB_REGION_US
+    app: $AWS_EB_APP_US
+    env: $AWS_EB_APP_ENV_US_PROD
+    bucket_name: $AWS_EB_APP_BUCKET_US_PROD
+    skip_cleanup: true
+    zip_file: dist.zip
+    on:
+      branch: master

CHANGELOG.md

@@ -47,3 +47,8 @@ API Server for CogniCity
 
 ### v3.0.6
 * Fix bug with expiry time in CAP format of floods/ endpoint
+* Updated Moment (known vulnerability in v2.18.1)
+* Test against PostgreSQL v10 (PostGIS 2.4)
+* Remove ?format option from /reports endpoint
+* Change floods endpoint to return new attributes column
+* Requires cognicity-schema v3.0.7 or later

README.md

@@ -123,8 +123,7 @@ Docs are hosted at https://urbanriskmap.github.io/cognicity-server/jsdoc/
 Before deployment:
 * Use NVM to switch to node and NPM versions specified in package.json for production
 * Run npm install
-* Run npm shrinkwrap --dev
-* Commit changes to npm-shrinkwrap.json
+* Commit changes to package-lock.json
 
 ### Release
 The release procedure is as follows: