Merge pull request #3 from eea/develop

[JENKINS] - Auto-release pipeline

CHANGELOG.md

@@ -4,10 +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).
 
+#### [2.2.1](https://github.com/eea/volto-block-toc/compare/2.2.0...2.2.1)
+
+- [JENKINS] - Auto-release pipeline [`9b6d06d`](https://github.com/eea/volto-block-toc/commit/9b6d06ddea14024d34f32207b370299878537b36)
+
 #### [2.2.0](https://github.com/eea/volto-block-toc/compare/2.1.0...2.2.0)
 
-- Refs #129213 volto-block-toc now expects an array of arrays for toc: [`4f23737`](https://github.com/eea/volto-block-toc/commit/4f237374eb7f848b310eec2d3304c6c0fe44f8cd)
+> 23 April 2021
+
+- Release 2.2.0 [`e194fb2`](https://github.com/eea/volto-block-toc/commit/e194fb255ce44f53c7b74adc53edfdb30627a2d0)
 - Refs #129213 removed )} from TOC edit form [`a64a641`](https://github.com/eea/volto-block-toc/commit/a64a6415ce2d91933298da1c08dad9abebd0460b)
+- Refs #129213 volto-block-toc now expects an array of arrays for toc: [`4f23737`](https://github.com/eea/volto-block-toc/commit/4f237374eb7f848b310eec2d3304c6c0fe44f8cd)
 
 #### [2.1.0](https://github.com/eea/volto-block-toc/compare/2.0.0...2.1.0)
 
@@ -27,21 +34,21 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 > 16 November 2020
 
-- [JENKINS] - Add Jenkins pipeline [`abc23b6`](https://github.com/eea/volto-block-toc/commit/abc23b6de8221363b9ec0260c3c0270418b80036)
-- yarn prettier [`18f812b`](https://github.com/eea/volto-block-toc/commit/18f812b776964062054bf6f77710c6a8ece1cc8f)
-- Release 1.0.0 [`528b2e6`](https://github.com/eea/volto-block-toc/commit/528b2e69303482bdefd240b3d6d95e1690e43a5d)
 - Release 1.0.0 [`5501bf6`](https://github.com/eea/volto-block-toc/commit/5501bf6e97cd6dae5af9735bea0ab28dee10dd30)
+- Release 1.0.0 [`528b2e6`](https://github.com/eea/volto-block-toc/commit/528b2e69303482bdefd240b3d6d95e1690e43a5d)
 - [JENKINS] - Fix SONAR tags [`931ec02`](https://github.com/eea/volto-block-toc/commit/931ec025b904df2e154a3dcc12dbf88e35843cfb)
+- [JENKINS] - Add Jenkins pipeline [`abc23b6`](https://github.com/eea/volto-block-toc/commit/abc23b6de8221363b9ec0260c3c0270418b80036)
+- yarn prettier [`18f812b`](https://github.com/eea/volto-block-toc/commit/18f812b776964062054bf6f77710c6a8ece1cc8f)
 
 #### 0.1.0
 
 > 21 October 2020
 
 - Easy walkaround to a bug that makes a country factsheet to crash [`#1`](https://github.com/eea/volto-block-toc/pull/1)
-- Add modules [`c7caa4b`](https://github.com/eea/volto-block-toc/commit/c7caa4bc13449fc843f74d9ee493d5886cd85f51)
-- Initial commit [`53f7a60`](https://github.com/eea/volto-block-toc/commit/53f7a608d21ccf289f5b934e72aa28c5fc51703c)
-- Add horizontal menu [`7515c72`](https://github.com/eea/volto-block-toc/commit/7515c72f52b7ccdaee107dbf76ff473240aaf6fe)
-- WIP [`2d33a65`](https://github.com/eea/volto-block-toc/commit/2d33a659016213e1c761cea31c3b796975c3bd97)
+- Easy walkaround to a bug [`51a9b1a`](https://github.com/eea/volto-block-toc/commit/51a9b1a69f8df138e9d063f143757dc9c3b562d2)
 - Fix block selection, remove unneeded classes [`86f8551`](https://github.com/eea/volto-block-toc/commit/86f85517117f02bc76b6349c5e66641f9e6037aa)
 - Fix levels selection widget [`2f28755`](https://github.com/eea/volto-block-toc/commit/2f28755bfdb172c5e48d62840b4559c269e04d33)
-- Easy walkaround to a bug [`51a9b1a`](https://github.com/eea/volto-block-toc/commit/51a9b1a69f8df138e9d063f143757dc9c3b562d2)
+- Add horizontal menu [`7515c72`](https://github.com/eea/volto-block-toc/commit/7515c72f52b7ccdaee107dbf76ff473240aaf6fe)
+- WIP [`2d33a65`](https://github.com/eea/volto-block-toc/commit/2d33a659016213e1c761cea31c3b796975c3bd97)
+- Add modules [`c7caa4b`](https://github.com/eea/volto-block-toc/commit/c7caa4bc13449fc843f74d9ee493d5886cd85f51)
+- Initial commit [`53f7a60`](https://github.com/eea/volto-block-toc/commit/53f7a608d21ccf289f5b934e72aa28c5fc51703c)

Jenkinsfile

@@ -94,6 +94,45 @@ pipeline {
       }
     }
 
+    stage('Pull Request') {
+      when {
+        not {
+          environment name: 'CHANGE_ID', value: ''
+        }
+        environment name: 'CHANGE_TARGET', value: 'master'
+      }
+      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"
+            }
+           withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
+            sh '''docker pull eeacms/gitflow'''
+            sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_CHANGE_TARGET="$CHANGE_TARGET" -e GIT_CHANGE_BRANCH="$CHANGE_BRANCH" -e GIT_CHANGE_AUTHOR="$CHANGE_AUTHOR" -e GIT_CHANGE_TITLE="$CHANGE_TITLE" -e GIT_TOKEN="$GITHUB_TOKEN" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow'''
+           }
+          }
+        }
+      }
+    }
+
+    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" eeacms/gitflow'''
+          }
+        }
+      }
+    }
+
   }
 
   post {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-block-toc",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "volto-block-toc: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",