From 4076d6fa50ebac1e03c0ddedbb19e4fa39579aaa Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 17 Aug 2020 17:47:32 +0200
Subject: [PATCH] bugfix: matomo csp chore: travis check on version adv
---
.travis.yml | 23 +++++++++++++++++++++++
deploy/csp/index.js | 6 ++----
mkdocs.yml | 2 ++
package.json | 2 +-
4 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index e9d1d40d2..1f8d78138 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,29 @@ jobs:
- NODE_ENV=test
- PORT=12234
+ - name: Check version number advanced (package.json)
+ if: |
+ (type = pull_request AND head_branch = staging) OR \
+ (type = pull_request AND head_branch = master AND NOT branch = staging)
+ script:
+ - PACKAGE_JSON_DIFF=$(git diff --name-only $TRAVIS_COMMIT_RANGE package.json)
+ - test -z "$PACKAGE_JSON_DIFF" && exit 1
+
+ - name: Check release notes authored (docs/releases/v?.?.?.md)
+ if: |
+ type = pull_request AND \
+ head_branch = staging
+ script:
+ - VERSION_NUM=$(jq '.version' < package.json)
+ - test -f docs/releases/v$VERSION_NUM.md || exit 1
+
+ - name: Release notes linked in mkdocs.yml
+ if: |
+ type = pull_request AND \
+ head_branch = staging
+ script:
+ - VERSION_NUM=$(jq '.version' < package.json)
+ - test -z $(grep $VERSION_NUM < mkdocs.yml) && exit 1
# Temporarily disabling browserstack e2e tests. They seem to fail without any reason
diff --git a/deploy/csp/index.js b/deploy/csp/index.js
index 7eebf7be2..eb071a225 100644
--- a/deploy/csp/index.js
+++ b/deploy/csp/index.js
@@ -87,12 +87,10 @@ module.exports = (app) => {
'unpkg.com',
'*.unpkg.com',
'*.jsdelivr.net',
-
- // Catching Safari 10 bug unsafe-eval
- "'sha256-yEVCaeeaeg6koloXfx+6DuFnP7SnjOwYZiWBTRFurJw='",
(req, res) => res.locals.nonce ? `'nonce-${res.locals.nonce}'` : null,
...SCRIPT_SRC,
- ...WHITE_LIST_SRC
+ ...WHITE_LIST_SRC,
+ ...defaultAllowedSites
],
reportUri: CSP_REPORT_URI || '/report-violation'
},
diff --git a/mkdocs.yml b/mkdocs.yml
index 1c35290ef..6f4c954cb 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -40,6 +40,8 @@ pages:
- Fetching datasets: 'advanced/datasets.md'
- Display non-atlas volumes: 'advanced/otherVolumes.md'
- Release notes:
+ - v2.2.5: 'releases/v2.2.5.md'
+ - v2.2.4: 'releases/v2.2.4.md'
- v2.2.3: 'releases/v2.2.3.md'
- v2.2.2: 'releases/v2.2.2.md'
- v2.2.1: 'releases/v2.2.1.md'
diff --git a/package.json b/package.json
index f3a7aff77..83e92595c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "interactive-viewer",
- "version": "2.2.2",
+ "version": "2.2.6",
"description": "HBP interactive atlas viewer. Integrating KG query, dataset previews & more. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular.io",
"scripts": {
"dev-server-export": "webpack-dev-server --config webpack.export.js",
--
GitLab