Merge pull request #10 from eea/develop

Release 1.1.0
eea · Mar 27, 2023 · f851da6 · f851da6
2 parents 65050ae + 498d8fb
commit f851da6
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).
 
+### [1.1.0](https://github.com/eea/volto-depiction/compare/1.0.1...1.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 1.1.0 [Alin Voinea - [`eeabec8`](https://github.com/eea/volto-depiction/commit/eeabec8ca5c7554ff63df2b2e69f43ea3a08ce8e)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`8d54caf`](https://github.com/eea/volto-depiction/commit/8d54cafc6c94f85681beba9658d398fba7f0fa91)]
 ### [1.0.1](https://github.com/eea/volto-depiction/compare/1.0.0...1.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
@@ -18,43 +24,29 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Update babel & jest config [Miu Razvan - [`6872ebe`](https://github.com/eea/volto-depiction/commit/6872ebe54802809135a364433f54658a39a42f2d)]
 - Update dependencies [Miu Razvan - [`d2097c4`](https://github.com/eea/volto-depiction/commit/d2097c4a0e6ac487d2507521f00055b9f090a7c2)]
 - Make this up to date [Miu Razvan - [`bf47bf4`](https://github.com/eea/volto-depiction/commit/bf47bf431785bfaeb6c015e5b180971615d925d5)]
-- Add Sonarqube tag using marine-frontend addons list [EEA Jenkins - [`a6f0aef`](https://github.com/eea/volto-depiction/commit/a6f0aef5501ffb25669396d9ae4ff253282b223b)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`1d1058e`](https://github.com/eea/volto-depiction/commit/1d1058eb572d243cb2e239631c55387f6b4eb026)]
 - update(jest): add @plone/volto-slate resolver refs- #153447 [nileshgulia1 - [`800f64a`](https://github.com/eea/volto-depiction/commit/800f64aa6633bee543ed4e65bd05206e10a9318a)]
 ### [0.1.6](https://github.com/eea/volto-depiction/compare/0.1.5...0.1.6) - 30 June 2022
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`f597a56`](https://github.com/eea/volto-depiction/commit/f597a56127ba5cf6fe008158c43aef6d5f675c11)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`0b8651c`](https://github.com/eea/volto-depiction/commit/0b8651ccd2c0a2c2c9de2e7b6d7b23f52587132b)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`e08c5af`](https://github.com/eea/volto-depiction/commit/e08c5af5df3a01b215a792963d0f5f52f7a12a65)]
 ### [0.1.5](https://github.com/eea/volto-depiction/compare/0.1.4...0.1.5) - 3 January 2022
 
 ### [0.1.4](https://github.com/eea/volto-depiction/compare/0.1.3...0.1.4) - 18 December 2021
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`6ce8199`](https://github.com/eea/volto-depiction/commit/6ce819981edd81814239cdb897956604a366b4ca)]
 ### [0.1.3](https://github.com/eea/volto-depiction/compare/0.1.2...0.1.3) - 10 December 2021
 
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`74874a6`](https://github.com/eea/volto-depiction/commit/74874a699443900f265cb8835d54ea07cfce3008)]
-- Add Sonarqube tag using industry-frontend addons list [EEA Jenkins - [`61f86b8`](https://github.com/eea/volto-depiction/commit/61f86b878b31fd72c3dedeabb3d6c6f9d820ddd7)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`4876b18`](https://github.com/eea/volto-depiction/commit/4876b18a41686b9f0b493ab1b614f6337720be7a)]
-- Add Sonarqube tag using bise-frontend addons list [EEA Jenkins - [`a52a41c`](https://github.com/eea/volto-depiction/commit/a52a41c08e64c6bf36c6a0910f214febdfb4ea07)]
-- Add Sonarqube tag using forests-frontend addons list [EEA Jenkins - [`4eec7b4`](https://github.com/eea/volto-depiction/commit/4eec7b47f4249006edd9f0e26f98c70c99804848)]
-- Add Sonarqube tag using sustainability-frontend addons list [EEA Jenkins - [`1ab89ea`](https://github.com/eea/volto-depiction/commit/1ab89eabe9bf288b5959ca8742d1eb8a23bf5e56)]
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`9f2b5c9`](https://github.com/eea/volto-depiction/commit/9f2b5c9b1a4f4c860565e5c3c0261f78f38891ab)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`eda9b73`](https://github.com/eea/volto-depiction/commit/eda9b73837fe03baffd626339e191ab484d3218b)]
 ### [0.1.2](https://github.com/eea/volto-depiction/compare/0.1.1...0.1.2) - 17 June 2021
 
 ### [0.1.1](https://github.com/eea/volto-depiction/compare/0.1.0...0.1.1) - 17 June 2021
 
 #### :hammer_and_wrench: Others
 
 - Fix README [Alin Voinea - [`1f43cb0`](https://github.com/eea/volto-depiction/commit/1f43cb0dfe8c693abf68ce5b981ed5af0d93d3db)]
-- yarn bootstrap [Alin Voinea - [`ecae0bf`](https://github.com/eea/volto-depiction/commit/ecae0bf1b11b5d5c00d6600524ff38f5923aab35)]
 - Bump release to 1.0.0 [Alin Voinea - [`5a84a5d`](https://github.com/eea/volto-depiction/commit/5a84a5d1d976e09b08633e504e2812843fd217b6)]
 ### 0.1.0 - 17 June 2021
 

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