From c5bb4d03399609d3fa96e6a2124d82141d52b9b1 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Thu, 11 Nov 2021 15:27:04 +0200 Subject: [PATCH 1/5] Add Sonarqube tag using industry-frontend addons list --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e644b9..452250c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { environment { GIT_NAME = "volto-widgets-view" 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" + 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" DEPENDENCIES = "" } From 1820d1b968813be6510243468dd6df430a8655d1 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Tue, 23 Nov 2021 19:25:07 +0200 Subject: [PATCH 2/5] Refs #142010 - Optimize Volto-addons gitflow pipelines --- Jenkinsfile | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 452250c..6e4f168 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,6 +11,13 @@ pipeline { stages { stage('Code') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + not { branch 'master' } + not { changelog '.*^Automated release [0-9\\.]+$' } + } + } steps { parallel( @@ -36,6 +43,13 @@ pipeline { } stage('Tests') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + not { branch 'master' } + not { changelog '.*^Automated release [0-9\\.]+$' } + } + } steps { parallel( @@ -75,6 +89,13 @@ pipeline { } stage('Integration tests') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + not { branch 'master' } + not { changelog '.*^Automated release [0-9\\.]+$' } + } + } steps { parallel( @@ -122,11 +143,13 @@ pipeline { } stage('Report to SonarQube') { - // Exclude Pull-Requests when { - allOf { environment name: 'CHANGE_ID', value: '' - } + anyOf { + branch 'master' + branch 'develop' + } + not { changelog '.*^Automated release [0-9\\.]+$' } } steps { node(label: 'swarm') { @@ -156,8 +179,8 @@ pipeline { steps { node(label: 'docker') { script { - if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { - error "Pipeline aborted due to PR not made from develop or hotfix branch" + if ( env.CHANGE_BRANCH != "develop" ) { + error "Pipeline aborted due to PR not made from develop branch" } withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) { sh '''docker pull eeacms/gitflow''' From d17afdeea5ba0c1dfd45c375a5c12e7ba8dca671 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Fri, 3 Dec 2021 18:33:38 +0200 Subject: [PATCH 3/5] [JENKINS] Refs #142010 - Optimize Volto-addons gitflow pipelines --- Jenkinsfile | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e4f168..fd89ed2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,23 @@ pipeline { stages { + stage('Release') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + node(label: 'docker') { + withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),string(credentialsId: 'eea-jenkins-npm-token', variable: 'NPM_TOKEN')]) { + sh '''docker pull eeacms/gitflow''' + sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" -e GIT_TOKEN="$GITHUB_TOKEN" -e NPM_TOKEN="$NPM_TOKEN" -e LANGUAGE=javascript eeacms/gitflow''' + } + } + } + } + stage('Code') { when { allOf { @@ -46,7 +63,6 @@ pipeline { when { allOf { environment name: 'CHANGE_ID', value: '' - not { branch 'master' } not { changelog '.*^Automated release [0-9\\.]+$' } } } @@ -92,7 +108,6 @@ pipeline { when { allOf { environment name: 'CHANGE_ID', value: '' - not { branch 'master' } not { changelog '.*^Automated release [0-9\\.]+$' } } } @@ -191,23 +206,6 @@ pipeline { } } - stage('Release') { - when { - allOf { - environment name: 'CHANGE_ID', value: '' - branch 'master' - } - } - steps { - node(label: 'docker') { - withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),string(credentialsId: 'eea-jenkins-npm-token', variable: 'NPM_TOKEN')]) { - sh '''docker pull eeacms/gitflow''' - sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" -e GIT_TOKEN="$GITHUB_TOKEN" -e NPM_TOKEN="$NPM_TOKEN" -e LANGUAGE=javascript eeacms/gitflow''' - } - } - } - } - } post { From f4077bb10e9f3c06ba17bad2beec03b771143354 Mon Sep 17 00:00:00 2001 From: Silviu Bogan Date: Thu, 9 Dec 2021 12:41:02 +0200 Subject: [PATCH 4/5] Correct Cypress tests to work with the new Slate-based Title blocks --- cypress/integration/block-basics.js | 19 ++++++++++--------- cypress/support/index.js | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/cypress/integration/block-basics.js b/cypress/integration/block-basics.js index 454084c..4daed6d 100644 --- a/cypress/integration/block-basics.js +++ b/cypress/integration/block-basics.js @@ -5,16 +5,17 @@ describe('Blocks Tests', () => { afterEach(tearDownAfterEach); it('Add Block: Empty', () => { + // without this the clear command below does nothing sometimes + cy.wait(500); + // Change page title - cy.get('.documentFirstHeading > .public-DraftStyleDefault-block') - .clear() - .type('My Add-on Page') - .get('.documentFirstHeading span[data-text]') - .contains('My Add-on Page'); - - cy.get('.documentFirstHeading > .public-DraftStyleDefault-block').type( - '{enter}', - ); + cy.get('[contenteditable=true]').first().clear(); + + cy.get('[contenteditable=true]').first().type('My Add-on Page'); + + cy.get('.documentFirstHeading').contains('My Add-on Page'); + + cy.get('[contenteditable=true]').first().type('{enter}'); // Add block cy.get('.ui.basic.icon.button.block-add-button').first().click(); diff --git a/cypress/support/index.js b/cypress/support/index.js index a3fd935..89aab00 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -44,7 +44,7 @@ export const setupBeforeEach = () => { cy.waitForResourceToLoad('@types'); cy.waitForResourceToLoad('my-page'); cy.navigate('/cypress/my-page/edit'); - cy.get(`.block.title [data-contents]`); + cy.get(`.block.title h1`); }; export const tearDownAfterEach = () => { From 1617cea687b6897c8f13f1fb1d5c406956621616 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Fri, 10 Dec 2021 08:36:09 +0000 Subject: [PATCH 5/5] Automated release 3.0.2 --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d0e743..edf1825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,16 @@ 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.0.2](https://github.com/eea/volto-widgets-view/compare/3.0.1...3.0.2) + +- Correct Cypress tests [`#8`](https://github.com/eea/volto-widgets-view/pull/8) +- Refs #142010 - Optimize Volto-addons gitflow pipelines [`1820d1b`](https://github.com/eea/volto-widgets-view/commit/1820d1b968813be6510243468dd6df430a8655d1) + #### [3.0.1](https://github.com/eea/volto-widgets-view/compare/3.0.0...3.0.1) +> 19 October 2021 + +- Consider dateLocale config. [`#7`](https://github.com/eea/volto-widgets-view/pull/7) - Add date locale config settings [`f425e19`](https://github.com/eea/volto-widgets-view/commit/f425e1980697f519cd8b0a26ae6945fbcbfc821d) ### [3.0.0](https://github.com/eea/volto-widgets-view/compare/2.1.2...3.0.0) diff --git a/package.json b/package.json index 4ebbf94..e49ac8d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-widgets-view", - "version": "3.0.1", + "version": "3.0.2", "description": "Volto Widgets in View mode", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",