From d81fb941ef732c980abdcc4111c8317062f13088 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Tue, 23 Nov 2021 19:48:47 +0200 Subject: [PATCH 1/5] Refs #142010 - Optimize Volto-addons gitflow pipelines --- Jenkinsfile | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f2f3ca0..3dc3829 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 9375225921d889c5bd191cf35aaf015b560dfaf0 Mon Sep 17 00:00:00 2001 From: Andrei Grigore Date: Wed, 24 Nov 2021 11:29:31 +0200 Subject: [PATCH 2/5] Add more color sets --- src/index.js | 23 +++++++++++++++- src/slate-styles.css | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index 349d41c..ada83d8 100644 --- a/src/index.js +++ b/src/index.js @@ -99,7 +99,28 @@ export default function applyConfig(config) { { cssClass: 'army-moccasin-text', label: 'Army moccasin text' }, { cssClass: 'army-khaki-text', label: 'Army khaki text' }, - { cssClass: 'vivid-green-text', label: 'Vivid green text' }, + //red series + { cssClass: 'red-mistyrose-text', label: 'Red mistyrose text' }, + { cssClass: 'red-darksalmon-text', label: 'Red darksalmon text' }, + { cssClass: 'red-indian-text', label: 'Red indian text' }, + { cssClass: 'red-brown-text', label: 'Red brown text' }, + { cssClass: 'red-dark-text', label: 'Red dark text' }, + + //orange set + { cssClass: 'orange-mistyrose-text', label: 'Orange mistyrose text' }, + { cssClass: 'orange-pale-text', label: 'Orange pale text' }, + { cssClass: 'orange-gold-text', label: 'Orange gold text' }, + { cssClass: 'orange-text', label: 'Orange text' }, + { cssClass: 'orange-sienna-text', label: 'Orange sienna text' }, + { cssClass: 'orange-saddle-text', label: 'Orange saddle text' }, + + //black set + { cssClass: 'black-text', label: 'Black text' }, + { cssClass: 'black-dimgray-text', label: 'Black dimgray text' }, + { cssClass: 'black-gray-text', label: 'Black gray text' }, + { cssClass: 'black-silver-text', label: 'Black silver text' }, + { cssClass: 'black-gainsboro-text', label: 'Black gainsboro text' }, + { cssClass: 'blue-text', label: 'Blue text' }, { cssClass: 'red-text', label: 'Red text' }, { cssClass: 'yellow-text', label: 'Yellow text' }, diff --git a/src/slate-styles.css b/src/slate-styles.css index 9a21167..da2b8cc 100644 --- a/src/slate-styles.css +++ b/src/slate-styles.css @@ -91,3 +91,67 @@ .grey-text { color: #8d8d8d; } + +/* red set */ + +.red-mistyrose-text { + color: #fce6dc; +} +.red-darksalmon-text { + color: #f39a86; +} + +.red-indian-text { + color: #e73d5c; +} + +.red-brown-text { + color: #b92f47; +} +.red-dark-text { + color: #8e1206; +} + +/* orange set */ + +.orange-pale-text { + color: #fff6a6; +} + +.orange-gold-text { + color: #ffe525; +} + +.orange-text { + color: #f7a600; +} + +.orange-sienna-text { + color: #b94b19; +} + +.orange-saddle-text { + color: #8d4107; +} + +/* black set */ + +.black-text { + color: black; +} + +.black-dimgray-text { + color: #6f6f6e; +} + +.black-gray-text { + color: #929291; +} + +.black-silver-text { + color: #bcbcbc; +} + +.black-gainsboro-text { + color: #e3e3e3; +} From af7ed16718d8c5a60c63db61788563d63533c8f7 Mon Sep 17 00:00:00 2001 From: Andrei Grigore Date: Wed, 24 Nov 2021 11:35:05 +0200 Subject: [PATCH 3/5] Fix styles lint --- src/slate-styles.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slate-styles.css b/src/slate-styles.css index da2b8cc..50225df 100644 --- a/src/slate-styles.css +++ b/src/slate-styles.css @@ -97,6 +97,7 @@ .red-mistyrose-text { color: #fce6dc; } + .red-darksalmon-text { color: #f39a86; } @@ -108,6 +109,7 @@ .red-brown-text { color: #b92f47; } + .red-dark-text { color: #8e1206; } @@ -154,4 +156,4 @@ .black-gainsboro-text { color: #e3e3e3; -} +} \ No newline at end of file From 12bc882f9cf9bca011bcf94f053c5e19914af678 Mon Sep 17 00:00:00 2001 From: Andrei Grigore Date: Wed, 24 Nov 2021 11:44:09 +0200 Subject: [PATCH 4/5] Prettier fix lint --- src/slate-styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slate-styles.css b/src/slate-styles.css index 50225df..ba649dd 100644 --- a/src/slate-styles.css +++ b/src/slate-styles.css @@ -156,4 +156,4 @@ .black-gainsboro-text { color: #e3e3e3; -} \ No newline at end of file +} From 90651bf44c9e98e26a98260a43e9799059651981 Mon Sep 17 00:00:00 2001 From: EEA Jenkins <@users.noreply.github.com> Date: Wed, 24 Nov 2021 12:43:10 +0000 Subject: [PATCH 5/5] Automated release 0.1.19 --- CHANGELOG.md | 13 ++++++++++--- package.json | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f82d16..e43654a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,18 @@ 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). +#### [0.1.19](https://github.com/eea/volto-forests-theme/compare/0.1.18...0.1.19) + +- Prettier fix lint [`12bc882`](https://github.com/eea/volto-forests-theme/commit/12bc882f9cf9bca011bcf94f053c5e19914af678) +- Fix styles lint [`af7ed16`](https://github.com/eea/volto-forests-theme/commit/af7ed16718d8c5a60c63db61788563d63533c8f7) +- Add more color sets [`9375225`](https://github.com/eea/volto-forests-theme/commit/9375225921d889c5bd191cf35aaf015b560dfaf0) +- Refs #142010 - Optimize Volto-addons gitflow pipelines [`d81fb94`](https://github.com/eea/volto-forests-theme/commit/d81fb941ef732c980abdcc4111c8317062f13088) + #### [0.1.18](https://github.com/eea/volto-forests-theme/compare/0.1.17...0.1.18) +> 23 November 2021 + +- Develop [`#22`](https://github.com/eea/volto-forests-theme/pull/22) - Add FISE colors in slate styles [`2921654`](https://github.com/eea/volto-forests-theme/commit/2921654debf224c8ffdaf325f3ca3180ee9dc323) - More limits to Lead nav [`0b5a328`](https://github.com/eea/volto-forests-theme/commit/0b5a328ac6b00ff60f2d4fa894d5cf131f5ce6a2) @@ -14,9 +24,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). > 23 November 2021 - More limits to Lead nav [`#21`](https://github.com/eea/volto-forests-theme/pull/21) -#### [0.1.17](https://github.com/eea/volto-forests-theme/compare/0.1.16...0.1.17) - -- More limits to Lead nav [`0b5a328`](https://github.com/eea/volto-forests-theme/commit/0b5a328ac6b00ff60f2d4fa894d5cf131f5ce6a2) #### [0.1.16](https://github.com/eea/volto-forests-theme/compare/0.1.15...0.1.16) diff --git a/package.json b/package.json index ae91d11..0cc5db5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-forests-theme", - "version": "0.1.18", + "version": "0.1.19", "description": "@eeacms/volto-forests-theme: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team",