Merge pull request #9 from eea/develop

Release 1.1.0
eea · Mar 27, 2023 · 3ccb807 · 3ccb807
2 parents 01dda34 + 14f0861
commit 3ccb807
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,12 +4,17 @@ 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-description-block/compare/1.0.1...1.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 1.1.0 [Alin Voinea - [`7453997`](https://github.com/eea/volto-description-block/commit/7453997de2bb62a0593d92dc1a784f3237190868)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`39d9f06`](https://github.com/eea/volto-description-block/commit/39d9f06e028c5006cf29e62984647e4fa8d4fc80)]
 ### [1.0.1](https://github.com/eea/volto-description-block/compare/1.0.0...1.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
 
 - test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`18e06c3`](https://github.com/eea/volto-description-block/commit/18e06c387847079ba8dee0ac5c059e8bba7671e7)]
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`629f0f6`](https://github.com/eea/volto-description-block/commit/629f0f6867bc7b69f571eea5d61df57473c1f1c4)]
 ## [1.0.0](https://github.com/eea/volto-description-block/compare/0.3.1...1.0.0) - 28 October 2022
 
 #### :nail_care: Enhancements
@@ -22,7 +27,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - test(scripts): Move scripts to Makefile [Alin Voinea - [`10b4eae`](https://github.com/eea/volto-description-block/commit/10b4eaec24009403b4100a29550d536c4e08d9a2)]
 - test(cypress): Cypress 10 / Razzle 4 [Alin Voinea - [`36429b4`](https://github.com/eea/volto-description-block/commit/36429b4656333472038fd245623736042e9cc2ae)]
 - Cleanup [Alin Voinea - [`5247e9c`](https://github.com/eea/volto-description-block/commit/5247e9cca2751495c91a52ce8cd0a3992a399df1)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`82652e5`](https://github.com/eea/volto-description-block/commit/82652e51b86f31d9a10e75c6986d3b44182b4931)]
 ### [0.3.1](https://github.com/eea/volto-description-block/compare/0.3.0...0.3.1) - 30 June 2022
 
 ### [0.3.0](https://github.com/eea/volto-description-block/compare/0.2.0...0.3.0) - 24 May 2022
@@ -32,7 +36,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Release 0.3.0 [Alin Voinea - [`39df766`](https://github.com/eea/volto-description-block/commit/39df76639343b340bb8369342728a35a0a7260f7)]
 - Update docs with demo gif [Alin Voinea - [`2b18328`](https://github.com/eea/volto-description-block/commit/2b183280ea637d53c1b20e933972d41bab0f08c8)]
 - Remove callout install; Default className to documentDescription; Enabled by default [Alin Voinea - [`64ae975`](https://github.com/eea/volto-description-block/commit/64ae975fdfe05f3e87788d09735282b756be1559)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`032ff16`](https://github.com/eea/volto-description-block/commit/032ff162b8c89c951840f6ae020480e4ae68272c)]
 ### [0.2.0](https://github.com/eea/volto-description-block/compare/0.1.3...0.2.0) - 19 May 2022
 
 ### [0.1.3](https://github.com/eea/volto-description-block/compare/0.1.2...0.1.3) - 17 May 2022

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-description-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu,forest.eea.europa.eu,demo-kitkat.dev2aws.eea.europa.eu,clmsdemo.devel6cph.eea.europa.eu,water.europa.eu-marine,biodiversity.europa.eu,climate-adapt.eea.europa.eu,climate-energy.eea.europa.eu,climate-advisory-board.devel4cph.eea.europa.eu,climate-advisory-board.europa.eu,www.eea.europa.eu-ims,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 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 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-description-block",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "@eeacms/volto-description-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -17,10 +17,9 @@
     "url": "git@github.com:eea/volto-description-block.git"
   },
   "addons": [],
-  "dependencies": {},
   "devDependencies": {
-    "@plone/scripts": "*",
     "@cypress/code-coverage": "^3.10.0",
+    "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "md5": "^2.3.0"
   },