Merge pull request #22 from eea/develop

Release 3.1.0
eea · Mar 27, 2023 · 1cfadb1 · 1cfadb1
2 parents f7dbcaf + a919071
commit 1cfadb1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 25 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).
 
+### [3.1.0](https://github.com/eea/volto-banner/compare/3.0.1...3.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 3.1.0 [Alin Voinea - [`db18243`](https://github.com/eea/volto-banner/commit/db18243f65f174f7fefa454506d845bbcb3e533a)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`f31ec21`](https://github.com/eea/volto-banner/commit/f31ec21aadc185bdde6c603c5a4b5db92c6e40dd)]
 ### [3.0.1](https://github.com/eea/volto-banner/compare/3.0.0...3.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
@@ -13,20 +19,16 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`c3aa9a4`](https://github.com/eea/volto-banner/commit/c3aa9a497db7cd976cb83029ac12b877175e43f0)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`831a521`](https://github.com/eea/volto-banner/commit/831a5211b7381de884c436404559959519668851)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`3156197`](https://github.com/eea/volto-banner/commit/31561978030af1dd294b2f5f5a671d69c8ff0cb9)]
 ### [2.2.1](https://github.com/eea/volto-banner/compare/2.2.0...2.2.1) - 30 June 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`5a818f5`](https://github.com/eea/volto-banner/commit/5a818f5ab409e0b67ffb820e03c5f440a2b51e16)]
 ### [2.2.0](https://github.com/eea/volto-banner/compare/2.1.0...2.2.0) - 8 April 2022
 
 #### :hammer_and_wrench: Others
 
 - Bumped to version 2.2 [kreafox - [`e1043a1`](https://github.com/eea/volto-banner/commit/e1043a1727fb717690f20b106508207ea83f2781)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`f5c8af2`](https://github.com/eea/volto-banner/commit/f5c8af266788ae1778d23fc36da9f1b4a274edf7)]
 ### [2.1.0](https://github.com/eea/volto-banner/compare/2.0.0...2.1.0) - 9 March 2022
 
 #### :hammer_and_wrench: Others
@@ -35,7 +37,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - [Feature #146857] Separate close behaviour for static and dynamic banner [Mihai Slobozeanu - [`6a29aa2`](https://github.com/eea/volto-banner/commit/6a29aa2ed162ffdd354f7d9cc5708b7233972442)]
 - [Feature #146857] Add banner close button - code review fix [Mihai Slobozeanu - [`3274f93`](https://github.com/eea/volto-banner/commit/3274f935b5d21f87ed1e15ebe9a117847200a811)]
 - [Feature #146857] Add banner close button [Mihai Slobozeanu - [`8844b17`](https://github.com/eea/volto-banner/commit/8844b17c691f9602d6d0121025a5d79cebe7bceb)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`2b36633`](https://github.com/eea/volto-banner/commit/2b36633d382bf77a2ff6b5b6e2455b1192e7bc81)]
 ## [2.0.0](https://github.com/eea/volto-banner/compare/1.0.4...2.0.0) - 16 February 2022
 
 #### :hammer_and_wrench: Others
@@ -53,30 +54,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`9d69833`](https://github.com/eea/volto-banner/commit/9d69833392946512eeae3226d20527c60b3cc604)]
 ### [1.0.2](https://github.com/eea/volto-banner/compare/1.0.1...1.0.2) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Correct one comment [Silviu Bogan - [`6ff7654`](https://github.com/eea/volto-banner/commit/6ff76545a1aca6a9b5e7b1e0586fd251f7ce02c8)]
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`34f7c8e`](https://github.com/eea/volto-banner/commit/34f7c8e82d6cd37f500ad58b600fb170074b5628)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`fd21e21`](https://github.com/eea/volto-banner/commit/fd21e2133b7f9877871f7cf7f38227395acfaf84)]
 ### [1.0.1](https://github.com/eea/volto-banner/compare/1.0.0...1.0.1) - 10 November 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #141204 added has-banner class to the body when volto-banner is rendered: [David Ichim - [`c91db3c`](https://github.com/eea/volto-banner/commit/c91db3cf8ee1630c14262b6d0a8bf41442932466)]
 - Removed container padding override, you can add your own override of the semantic ui classes: [David Ichim - [`994a82e`](https://github.com/eea/volto-banner/commit/994a82eabd9f966c96889beb4d9473cfca5a467a)]
 - Padding variable [Miu Razvan - [`336046e`](https://github.com/eea/volto-banner/commit/336046e49d6edcf98cf24911bf71084b32f5be67)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`66fd1ca`](https://github.com/eea/volto-banner/commit/66fd1caa3c3e6fbedf48aaafe48286d770afb2fb)]
-- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`0a85dc7`](https://github.com/eea/volto-banner/commit/0a85dc76aef1d3c6ccac40f5a64bb9c2fd1417a3)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`97bba71`](https://github.com/eea/volto-banner/commit/97bba71301c37c21a2bfd46b90f7cba48c774428)]
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`0aad1ab`](https://github.com/eea/volto-banner/commit/0aad1ab13f6911a4d75e6fdb92a328cfb5ffa6cf)]
 ## [1.0.0](https://github.com/eea/volto-banner/compare/0.1.7...1.0.0) - 29 September 2021
 
 #### :hammer_and_wrench: Others
 
-- yarn stylelint:fix [Alin Voinea - [`8799866`](https://github.com/eea/volto-banner/commit/879986634cd2776a3dff40273ef18cc1c5cb6ef7)]
 - Fix padding when resolution is between 760 and 1400px [Alin Voinea - [`850706a`](https://github.com/eea/volto-banner/commit/850706a208f15ebaf61483ecba49cc96b84fbaf1)]
 - Allow HTML with bannerMessahe [Alin Voinea - [`6ab587d`](https://github.com/eea/volto-banner/commit/6ab587d66f0aebc0500d33a734b370631e98984f)]
 ### [0.1.7](https://github.com/eea/volto-banner/compare/0.1.6...0.1.7) - 28 September 2021
@@ -85,8 +79,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 - cosmetics [nileshgulia1 - [`414ed83`](https://github.com/eea/volto-banner/commit/414ed830c1e4fbc8db45480016e6afa17a9982a1)]
 - make icon, header and content customizable [nileshgulia1 - [`74a5c8c`](https://github.com/eea/volto-banner/commit/74a5c8c15dc4610c41883e71a2244a0edb66c7a4)]
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`0cd24e7`](https://github.com/eea/volto-banner/commit/0cd24e7a124b18c82b37ccd0655ee10ffe2d7087)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`fbe6228`](https://github.com/eea/volto-banner/commit/fbe622843226b96e00d41ac974be7ff47354e4f7)]
 ### [0.1.6](https://github.com/eea/volto-banner/compare/0.1.5...0.1.6) - 26 August 2021
 
 #### :hammer_and_wrench: Others

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-banner"
         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-banner",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "@eeacms/volto-banner: 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-banner.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"
   },