Merge pull request #21 from eea/develop

Release 5.1.0
eea · Mar 27, 2023 · fc5fb12 · fc5fb12
2 parents a738843 + 2085dca
commit fc5fb12
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-object-widget/compare/5.0.1...5.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 5.1.0 [Alin Voinea - [`c09cdee`](https://github.com/eea/volto-object-widget/commit/c09cdeedfcec2f41c2b2a6e8862acf95729fd8db)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`33ab4d9`](https://github.com/eea/volto-object-widget/commit/33ab4d94a61939763e245c721acc9c300e8deba6)]
 ### [5.0.1](https://github.com/eea/volto-object-widget/compare/5.0.0...5.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
@@ -18,14 +24,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Typo [Miu Razvan - [`0eac194`](https://github.com/eea/volto-object-widget/commit/0eac194761c04db9807ca63381b25c13c7a854bd)]
 - Prepare 5.0.0 release [Miu Razvan - [`2a12c37`](https://github.com/eea/volto-object-widget/commit/2a12c377a7bf5a1a51966ab1e1c867f1b55ccb95)]
 - Update babel & jest config [Miu Razvan - [`8269b4a`](https://github.com/eea/volto-object-widget/commit/8269b4ac4aa9d487579b35ff41d0fea9dce5fc45)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`2b550d7`](https://github.com/eea/volto-object-widget/commit/2b550d76313569397fda8967147e0052176f823e)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`08aa211`](https://github.com/eea/volto-object-widget/commit/08aa211cdfa1b48817a4af6a21c3b033ef6642ea)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`6963a87`](https://github.com/eea/volto-object-widget/commit/6963a87a0c84910c0ef695652d944115d487b24e)]
 ### [4.0.2](https://github.com/eea/volto-object-widget/compare/4.0.1...4.0.2) - 30 June 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`f7e9285`](https://github.com/eea/volto-object-widget/commit/f7e928506f881dcf6bcd5f1bd5897148af2c4c38)]
 ### [4.0.1](https://github.com/eea/volto-object-widget/compare/4.0.0...4.0.1) - 20 May 2022
 
 ## [4.0.0](https://github.com/eea/volto-object-widget/compare/3.0.3...4.0.0) - 19 May 2022
@@ -39,33 +42,23 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Release 4.0.0 [Alin Voinea - [`553e4ab`](https://github.com/eea/volto-object-widget/commit/553e4ab8b5888a2af43dcaf8be6d955cc3949513)]
 - Improved style for attached image widget [Miu Razvan - [`8c770cd`](https://github.com/eea/volto-object-widget/commit/8c770cdeb6af776208bd9a3936f33f5370d70fd7)]
 - Release 3.1.0 [Alin Voinea - [`61dd13b`](https://github.com/eea/volto-object-widget/commit/61dd13b20b2e00305af00b762e3e4d734a03cf0d)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0912594`](https://github.com/eea/volto-object-widget/commit/09125945f04192d8af200c6828c9388a29f4e8ff)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`beb8f0b`](https://github.com/eea/volto-object-widget/commit/beb8f0ba5091911428b885e39b2bcdcdf390104c)]
 ### [3.0.3](https://github.com/eea/volto-object-widget/compare/3.0.2...3.0.3) - 3 January 2022
 
 ### [3.0.2](https://github.com/eea/volto-object-widget/compare/3.0.1...3.0.2) - 18 December 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`5f6c212`](https://github.com/eea/volto-object-widget/commit/5f6c212134fee7d1096c9733e215a517d9842279)]
 ### [3.0.1](https://github.com/eea/volto-object-widget/compare/3.0.0...3.0.1) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`0598f50`](https://github.com/eea/volto-object-widget/commit/0598f50fd11e720e3b78d039987d92580ad6c7d6)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`0eb9ee2`](https://github.com/eea/volto-object-widget/commit/0eb9ee20b47872dcd13fbd016443226968b93e6b)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`da90a9b`](https://github.com/eea/volto-object-widget/commit/da90a9bcd52894ca8e2303e9f4d6f39f6e7c727a)]
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`b9f9262`](https://github.com/eea/volto-object-widget/commit/b9f9262a51f8c7b21081ed7a3c471ed1f54d600d)]
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`5374fa5`](https://github.com/eea/volto-object-widget/commit/5374fa5d6fb973c1534d1608a623f1e0a1ec5266)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`c954416`](https://github.com/eea/volto-object-widget/commit/c9544161ee8717e6568535527d720f884347160c)]
 ## [3.0.0](https://github.com/eea/volto-object-widget/compare/2.2.3...3.0.0) - 3 September 2021
 
 #### :hammer_and_wrench: Others
 
 - Fix ObjectListWidget tests [Alin Voinea - [`149c3ae`](https://github.com/eea/volto-object-widget/commit/149c3aee0fe40c5a80d58cc8a12bd1b67a66366f)]
 - Remove DEPRECATED ObjectWidget. Moved to Volto core. [Alin Voinea - [`415e7a9`](https://github.com/eea/volto-object-widget/commit/415e7a91652d7fc68e0c0dd6648f9bc5a50170f9)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`49e4e6e`](https://github.com/eea/volto-object-widget/commit/49e4e6e6376bbacbf657925811ae087da3bd2d30)]
-- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`4c3c118`](https://github.com/eea/volto-object-widget/commit/4c3c118290cbd25432111c60090f6aade1bac1d2)]
 ### [2.2.3](https://github.com/eea/volto-object-widget/compare/2.2.2...2.2.3) - 4 June 2021
 
 #### :hammer_and_wrench: Others

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-object-widget"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.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,forest.eea.europa.eu,biodiversity.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.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-object-widget",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "description": "volto-object-widget: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -17,10 +17,9 @@
     "type": "git",
     "url": "git@github.com:eea/volto-object-widget.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"
   },