Merge pull request #26 from eea/develop

Release 5.1.0
eea · Mar 27, 2023 · 0a9b383 · 0a9b383
2 parents 7e4dc0f + 52b7641
commit 0a9b383
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+### [5.1.0](https://github.com/eea/volto-widget-temporal-coverage/compare/5.0.1...5.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 5.1.0 [Alin Voinea - [`6dbd591`](https://github.com/eea/volto-widget-temporal-coverage/commit/6dbd5918ba3237b939d354e5c1fcc01f24a71392)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`25f6ca6`](https://github.com/eea/volto-widget-temporal-coverage/commit/25f6ca6d7d41a969a9845e71591f5bbc20c9a1e8)]
 ### [5.0.1](https://github.com/eea/volto-widget-temporal-coverage/compare/5.0.0...5.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
@@ -15,16 +21,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - test(jest): Fix jest tests [Alin Voinea - [`62db38d`](https://github.com/eea/volto-widget-temporal-coverage/commit/62db38df23b5835e28167a6c58239f5fa7d5ecb1)]
 - Cleanup [Alin Voinea - [`3b94ba4`](https://github.com/eea/volto-widget-temporal-coverage/commit/3b94ba407cce0f72baba92b159f79b4dc0ae7ea2)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`2aad9af`](https://github.com/eea/volto-widget-temporal-coverage/commit/2aad9afc04afe37df914877b79c6c66d5836b972)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`131adf8`](https://github.com/eea/volto-widget-temporal-coverage/commit/131adf85ba2d534ac92b56a4a958aa0360c5e050)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`d1b17bf`](https://github.com/eea/volto-widget-temporal-coverage/commit/d1b17bff235073a80679e51ef5883252b88284b8)]
 ### [4.0.6](https://github.com/eea/volto-widget-temporal-coverage/compare/4.0.5...4.0.6) - 1 July 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`efecda2`](https://github.com/eea/volto-widget-temporal-coverage/commit/efecda2d665d526791629f727abf7f72c345d328)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`e845bcc`](https://github.com/eea/volto-widget-temporal-coverage/commit/e845bcc3b57d0eb75ca904dd92f220dd813ab183)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`e31d4fd`](https://github.com/eea/volto-widget-temporal-coverage/commit/e31d4fd1907592770f45fc3315465db78b95e311)]
 ### [4.0.5](https://github.com/eea/volto-widget-temporal-coverage/compare/4.0.4...4.0.5) - 20 January 2022
 
 ### [4.0.4](https://github.com/eea/volto-widget-temporal-coverage/compare/4.0.3...4.0.4) - 3 January 2022
@@ -35,28 +36,20 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`1dbe0fb`](https://github.com/eea/volto-widget-temporal-coverage/commit/1dbe0fb9282730bf27ec7f8bbfa8adc0e6d0e026)]
 ### [4.0.1](https://github.com/eea/volto-widget-temporal-coverage/compare/4.0.0...4.0.1) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`9c890b5`](https://github.com/eea/volto-widget-temporal-coverage/commit/9c890b54735cd21552716b7850f296b7f78c8bf7)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`4371424`](https://github.com/eea/volto-widget-temporal-coverage/commit/437142462619c72eb7c6d3a47d9ff92b33c7380b)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`8610d43`](https://github.com/eea/volto-widget-temporal-coverage/commit/8610d43fb3fa4646729823d0ec8a1a2c7e0786d7)]
-- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`fb32ea2`](https://github.com/eea/volto-widget-temporal-coverage/commit/fb32ea296ca1f3926744e84a290e2d789c803a67)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`8c5a32d`](https://github.com/eea/volto-widget-temporal-coverage/commit/8c5a32dd6eebe672fd263a3771b31e5e11c32bc9)]
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`69d2513`](https://github.com/eea/volto-widget-temporal-coverage/commit/69d2513d49bb9384a8a9f219411c2acb9659b19e)]
 ## [4.0.0](https://github.com/eea/volto-widget-temporal-coverage/compare/3.0.2...4.0.0) - 24 September 2021
 
 #### :hammer_and_wrench: Others
 
 - Update TemporalWidgetView unit test [Alin Voinea - [`8388694`](https://github.com/eea/volto-widget-temporal-coverage/commit/8388694a2152fcbccbffceeb3c10d3c5247870f7)]
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`3bbc3f9`](https://github.com/eea/volto-widget-temporal-coverage/commit/3bbc3f9e29b5457ec7b9120d73b697d5e4b570ce)]
 ### [3.0.2](https://github.com/eea/volto-widget-temporal-coverage/compare/3.0.1...3.0.2) - 10 September 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`617ec99`](https://github.com/eea/volto-widget-temporal-coverage/commit/617ec993e3374903b4566c49b86ddb5b1630b113)]
 ### [3.0.1](https://github.com/eea/volto-widget-temporal-coverage/compare/3.0.0...3.0.1) - 9 August 2021
 
 #### :hammer_and_wrench: Others

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-widget-temporal-coverage"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,prod-www.eea.europa.eu,water.europa.eu-marine"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu,industry.eea.europa.eu,water.europa.eu-freshwater,demo-www.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,circularity.eea.europa.eu,prod-www.eea.europa.eu,water.europa.eu-marine,demo-kitkat.dev2aws.eea.europa.eu,climate-adapt.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-en"
         DEPENDENCIES = ""
-        VOLTO = "alpha"
+        VOLTO = ""
     }
 
   stages {
@@ -41,19 +41,19 @@ pipeline {
 
           "ES lint": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha eslint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-eslint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci eslint'''
             }
           },
 
           "Style lint": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha stylelint'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-stylelint" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci stylelint'''
             }
           },
 
           "Prettier": {
             node(label: 'docker') {
-              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha prettier'''
+              sh '''docker run -i --rm --name="$BUILD_TAG-prettier" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci prettier'''
             }
           }
         )
@@ -77,8 +77,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone/volto-addon-ci:alpha'''
-                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci:alpha'''
+                  sh '''docker pull plone/volto-addon-ci'''
+                  sh '''docker run -i --name="$BUILD_TAG-volto" -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e VOLTO=$VOLTO plone/volto-addon-ci'''
                   sh '''rm -rf xunit-reports'''
                   sh '''mkdir -p xunit-reports'''
                   sh '''docker cp $BUILD_TAG-volto:/opt/frontend/my-volto-project/coverage xunit-reports/'''
@@ -126,7 +126,7 @@ pipeline {
               script {
                 try {
                   sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
-                  sh '''docker pull plone/volto-addon-ci:alpha; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO=$VOLTO plone/volto-addon-ci:alpha cypress'''
+                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO=$VOLTO plone/volto-addon-ci cypress'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-widget-temporal-coverage",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "volto-widget-temporal-coverage: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -16,10 +16,9 @@
     "type": "git",
     "url": "git@github.com:eea/volto-widget-temporal-coverage.git"
   },
-  "dependencies": {},
   "devDependencies": {
-    "@plone/scripts": "*",
     "@cypress/code-coverage": "^3.10.0",
+    "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "md5": "^2.3.0"
   },