Merge pull request #37 from eea/develop

`@media: print {}` to show open panes
eea · Nov 25, 2021 · f92d3cc · f92d3cc
2 parents 8dd70f0 + bbdf527
commit f92d3cc
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
diff --git 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.4.9](https://github.com/eea/volto-accordion-block/compare/3.4.8...3.4.9)
+
+- @media print to show open panes [`e111771`](https://github.com/eea/volto-accordion-block/commit/e111771cc1d1c2d5d19c55371cf348e764f90fff)
+- Refs #142010 - Optimize Volto-addons gitflow pipelines [`8072099`](https://github.com/eea/volto-accordion-block/commit/807209972e79796af5a9fad60e17e04a32ffc776)
+
 #### [3.4.8](https://github.com/eea/volto-accordion-block/compare/3.4.7...3.4.8)
 
+> 22 November 2021
+
+- run cypress on slate and draftjs blocks [`#36`](https://github.com/eea/volto-accordion-block/pull/36)
 - cy: make tests run with both slate and draftjs [`e51f7a5`](https://github.com/eea/volto-accordion-block/commit/e51f7a5c36804240d90e19baa9c7b321e41a7c23)
 
 #### [3.4.7](https://github.com/eea/volto-accordion-block/compare/3.4.6...3.4.7)

diff --git 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'''

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-accordion-block",
-  "version": "3.4.8",
+  "version": "3.4.9",
   "description": "volto-accordion-block: Volto accordion block",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/components/manage/Blocks/Accordion/editor.less b/src/components/manage/Blocks/Accordion/editor.less
@@ -155,3 +155,15 @@
     padding: 9px !important;
   }
 }
+
+@media print {
+  div.rah-static.rah-static--height-zero {
+    overflow: visible;
+    height: auto !important;
+  }
+
+  div.rah-static.rah-static--height-zero > div {
+    display: block !important;
+    opacity: 1 !important;
+  }
+}