Merge pull request #21 from eea/develop

Release 3.1.0
eea · Mar 27, 2023 · 9fe0e1e · 9fe0e1e
2 parents 023f5bf + 782b7bd
commit 9fe0e1e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 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).
 
+### [3.1.0](https://github.com/eea/volto-workflow-progress/compare/3.0.1...3.1.0) - 27 March 2023
+
+#### :hammer_and_wrench: Others
+
+- Release 3.1.0 [Alin Voinea - [`f767723`](https://github.com/eea/volto-workflow-progress/commit/f7677233d28e2493a1aeba60afea121fee01a2bf)]
+- test(Jenkins): Run tests and cypress with latest canary @plone/volto [Alin Voinea - [`f6dd84c`](https://github.com/eea/volto-workflow-progress/commit/f6dd84c8b73abcfb9c0c9d0884abb4e2e3d424f7)]
 ### [3.0.1](https://github.com/eea/volto-workflow-progress/compare/3.0.0...3.0.1) - 16 November 2022
 
 #### :hammer_and_wrench: Others
 
 - test(estlint): Fix .project.eslintrc.js [Alin Voinea - [`47ba7a3`](https://github.com/eea/volto-workflow-progress/commit/47ba7a3debdcf32586a2a1959b4950e46ce19f8e)]
-- Add Sonarqube tag using circularity-frontend addons list [EEA Jenkins - [`8e41851`](https://github.com/eea/volto-workflow-progress/commit/8e4185189817f9965eb9e026787ea46b6a3580ff)]
 ## [3.0.0](https://github.com/eea/volto-workflow-progress/compare/2.3.14...3.0.0) - 28 October 2022
 
 #### :nail_care: Enhancements
@@ -23,7 +28,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Old customizations [Alin Voinea - [`6f6ecca`](https://github.com/eea/volto-workflow-progress/commit/6f6eccab9f1fd9b705c36700f57a00c892a21141)]
 - Temporary disable broken customization for Workflow.jsx [Alin Voinea - [`fc00799`](https://github.com/eea/volto-workflow-progress/commit/fc007997d1c43a0502eab7f39a0dbc83dc77229b)]
 - Update dependencies [Alin Voinea - [`855ae26`](https://github.com/eea/volto-workflow-progress/commit/855ae26e1dad988500f8ec73386ae7405b6ba585)]
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`4f1b1cb`](https://github.com/eea/volto-workflow-progress/commit/4f1b1cb1ba02d22807d2743066a18056b40c3e6d)]
 ### [2.3.14](https://github.com/eea/volto-workflow-progress/compare/2.3.13...2.3.14) - 11 August 2022
 
 ### [2.3.13](https://github.com/eea/volto-workflow-progress/compare/2.3.12...2.3.13) - 9 August 2022
@@ -32,7 +36,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`2f518d3`](https://github.com/eea/volto-workflow-progress/commit/2f518d3bd6816e9bc9631924aed4e5f792963250)]
 ### [2.3.11](https://github.com/eea/volto-workflow-progress/compare/2.3.10...2.3.11) - 14 March 2022
 
 ### [2.3.10](https://github.com/eea/volto-workflow-progress/compare/2.3.9...2.3.10) - 3 January 2022
@@ -44,8 +47,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #142010 - Optimize Volto-addons gitflow pipelines [valentinab25 - [`b0b2031`](https://github.com/eea/volto-workflow-progress/commit/b0b203187598ae8a35108576f8f876e6502d93aa)]
-- Add Sonarqube tag using climate-energy-frontend addons list [EEA Jenkins - [`ba1c0ae`](https://github.com/eea/volto-workflow-progress/commit/ba1c0aeab7d3b226da06b0f99b93f4d90e91bc91)]
-- Add Sonarqube tag using ims-frontend addons list [EEA Jenkins - [`25bc06a`](https://github.com/eea/volto-workflow-progress/commit/25bc06a482dd200e393734ae4e62d7e4297eefb3)]
 ### [2.3.7](https://github.com/eea/volto-workflow-progress/compare/2.3.6...2.3.7) - 16 August 2021
 
 ### [2.3.6](https://github.com/eea/volto-workflow-progress/compare/2.3.5...2.3.6) - 30 June 2021
@@ -144,5 +145,4 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - css and comments [Alex Medesan - [`4523233`](https://github.com/eea/volto-workflow-progress/commit/45232334876e86b6a6af9e9bd8ae5b38bca4dc01)]
 - fixed errors for components without workflow, improved css, small clean [Alex Medesan - [`cc31acb`](https://github.com/eea/volto-workflow-progress/commit/cc31acbb46bcbba615e659dd69fc3a5084382838)]
 - implemented workflow tracker based on route. uses redux. [Alex Medesan - [`40dd7de`](https://github.com/eea/volto-workflow-progress/commit/40dd7de5cca6a73b34f03e95ece19ff8fae25001)]
-- yarn bootstrap [Alin Voinea - [`477e9a8`](https://github.com/eea/volto-workflow-progress/commit/477e9a8f8e5d15ebf6df2e845f212e02179b8553)]
 - Initial commit [Alin Voinea - [`2e96b2d`](https://github.com/eea/volto-workflow-progress/commit/2e96b2d72d77f1ec2ca1ef00b260b7fe7cca07c9)]
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,9 +4,9 @@ pipeline {
   environment {
         GIT_NAME = "volto-workflow-progress"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,demo-www.eea.europa.eu,prod-www.eea.europa.eu,circularity.eea.europa.eu,www.eea.europa.eu-en,climate-adapt.eea.europa.eu"
         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-workflow-progress",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "volto-workflow-progress: 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-workflow-progress.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"
   },