From 853efd95a562dd5580262e7dbd1509b6041172b6 Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Tue, 18 Aug 2020 10:23:29 +0200
Subject: [PATCH] chore: updated travis bugfix: kg dataset previewer URL
---
.travis.yml | 12 +++---------
docs/releases/v2.2.6.md | 3 ++-
webpack.staticassets.js | 2 +-
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 5f5023d08..e8aab9d64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,9 +48,9 @@ jobs:
(type = pull_request AND branch = staging) OR \
(type = pull_request AND branch = master AND NOT head_branch = staging)
script:
- - |
- PACKAGE_JSON_DIFF=$(git diff --name-only $TRAVIS_COMMIT_RANGE package.json) && \
- test -z "$PACKAGE_JSON_DIFF" && exit 1 || exit 0
+ - MASTER_VERSION=$(git show origin/master:package.json | jq '.version')
+ - THIS_VERSION=$(jq '.version' < package.json)
+ - test "$MASTER_VERSION" == "$THIS_VERSION" && exit 1 || exit 0
- name: Check release notes authored (docs/releases/v?.?.?.md)
if: |
@@ -92,12 +92,6 @@ jobs:
# - BROWSERSTACK_USERNAME=xiao33
# - secure: "YD2hDBnWzcMs9mTJCsKkJimd+mYKP8V1lTaCnxNvspJUxTuBWFmr8cvryIs9G9DhwgxkC3YL7hugsGkwMg6OIq27vLlo8mgoKS7/qrkWAJApGvDW4jc4CHpI2iE/ryrwG1bI3u9TuG0kSw+2sN/786LBgArlf5NbmwB9zmW4zyzjXXzSME34cwYdfEP96L2cob/uGiIj9YdaA1k3zfBhQQlp328i/xzYbIAcwfIia1AKYh/wgCzj+yfWDQ0Rtg9VcI2JiNfcbzMCgvDEBzshgeXuubFd9GPqPsc8zJhYqAi/15ge+WiB8R50MnZsYHO39JJihQzKz6WxIZQDeOQ2xd600NhFFLg6WPdE3jxAyENouTAd+0zJgXEeUU71YBDBl6RViagf8k7eOe9oMPW5ZlevdD3vcI8BC/qUL6Evye8QDDNi0s8gbIvcnJl5QMRBpeYcm/QaRUow1YeJobpccj/3tb7qTbc7T4Rha/NRBNhbhp/WzDSO/BUSEtpgJ3YwSEPTiEeSocTRT8ylnhEtBB70h4vQSClV73lW4vn7WjdZUTRACdxFNJ1MteQJ+3bgzyWMhDtdQo6BSz2UxF0mQFayAu2p9j0+MbB7x2zW9tksSw+6B6EjzPhQw6eOs2K0+syxWg09MTW1Fy6n0Zgchn0RWSnEPqPvss6kB2pkAR4="
-env:
- global:
- - CHROMIUM_VERSION=80.0.3987.106
- - PPTR_VERSION=2.1.0
- - PROTRACTOR_SPECS=./src/navigating/*.e2e-spec.js
-
# addons:
# browserstack:
# username: "xiao33"
diff --git a/docs/releases/v2.2.6.md b/docs/releases/v2.2.6.md
index 8b16e19ee..5319b9e90 100644
--- a/docs/releases/v2.2.6.md
+++ b/docs/releases/v2.2.6.md
@@ -2,4 +2,5 @@
## Bugfixes
-- Fixed matomo CSP issues
\ No newline at end of file
+- Fixed matomo CSP issues
+- Updated kg dataset previewer URL
diff --git a/webpack.staticassets.js b/webpack.staticassets.js
index 163b00926..9175274b0 100644
--- a/webpack.staticassets.js
+++ b/webpack.staticassets.js
@@ -71,7 +71,7 @@ module.exports = {
: JSON.stringify('unspecificied hash'),
PRODUCTION: !!process.env.PRODUCTION,
BACKEND_URL: (process.env.BACKEND_URL && JSON.stringify(process.env.BACKEND_URL)) || 'null',
- DATASET_PREVIEW_URL: JSON.stringify(process.env.DATASET_PREVIEW_URL || 'https://hbp-kg-dataset-previewer.apps.hbp.eu/datasetPreview'),
+ DATASET_PREVIEW_URL: JSON.stringify(process.env.DATASET_PREVIEW_URL || 'https://hbp-kg-dataset-previewer.apps.hbp.eu/v2'),
SPATIAL_TRANSFORM_BACKEND: JSON.stringify(process.env.SPATIAL_TRANSFORM_BACKEND || 'https://hbp-spatial-backend.apps.hbp.eu'),
MATOMO_URL: JSON.stringify(process.env.MATOMO_URL || null),
MATOMO_ID: JSON.stringify(process.env.MATOMO_ID || null),
--
GitLab