diff --git a/.travis.yml b/.travis.yml index 1f8d781382097aefc1261e1c1b56c5aaf97027da..5f5023d08eb1bde0e93fc40924a1bf81e0c198fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,29 +42,40 @@ jobs: - NODE_ENV=test - PORT=12234 - - name: Check version number advanced (package.json) + - stage: Check version numbers and release notes + 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) + (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 + - | + PACKAGE_JSON_DIFF=$(git diff --name-only $TRAVIS_COMMIT_RANGE package.json) && \ + test -z "$PACKAGE_JSON_DIFF" && exit 1 || exit 0 - name: Check release notes authored (docs/releases/v?.?.?.md) if: | - type = pull_request AND \ - head_branch = staging + (type = pull_request AND branch = staging) OR \ + (type = pull_request AND branch = master AND NOT head_branch = staging) script: - - VERSION_NUM=$(jq '.version' < package.json) - - test -f docs/releases/v$VERSION_NUM.md || exit 1 + - | + VERSION_NUM=$(jq '.version' < package.json) && \ + VERSION_NUM=${VERSION_NUM#\"} && \ + VERSION_NUM=${VERSION_NUM%\"} && \ + test -f docs/releases/v$VERSION_NUM.md && exit 0 || exit 1 - name: Release notes linked in mkdocs.yml if: | - type = pull_request AND \ - head_branch = staging + (type = pull_request AND branch = staging) OR \ + (type = pull_request AND branch = master AND NOT head_branch = staging) script: - VERSION_NUM=$(jq '.version' < package.json) - - test -z $(grep $VERSION_NUM < mkdocs.yml) && exit 1 + - VERSION_NUM=${VERSION_NUM#\"} + - VERSION_NUM=${VERSION_NUM%\"} + - 'echo "VERSION_NUM: $VERSION_NUM"' + - cat mkdocs.yml + - GREP_VERSION_NUM=$(cat mkdocs.yml | grep $VERSION_NUM) + - 'echo GREP_VERSION_NUM: $GREP_VERSION_NUM' + - test -z "$GREP_VERSION_NUM" && exit 1 || exit 0 # Temporarily disabling browserstack e2e tests. They seem to fail without any reason diff --git a/docs/releases/v2.2.6.md b/docs/releases/v2.2.6.md new file mode 100644 index 0000000000000000000000000000000000000000..8b16e19eec0cb1b1105ab54a754ccbcc017bfb90 --- /dev/null +++ b/docs/releases/v2.2.6.md @@ -0,0 +1,5 @@ +# v2.2.6 + +## Bugfixes + +- Fixed matomo CSP issues \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index 6f4c954cbed4859c6d34e17d5fb0e57b2a068b86..0814da866140f5a958a6ff408a34e71ffb44f504 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -40,6 +40,7 @@ pages: - Fetching datasets: 'advanced/datasets.md' - Display non-atlas volumes: 'advanced/otherVolumes.md' - Release notes: + - v2.2.6: 'releases/v2.2.6.md' - v2.2.5: 'releases/v2.2.5.md' - v2.2.4: 'releases/v2.2.4.md' - v2.2.3: 'releases/v2.2.3.md'