Skip to content
This repository has been archived by the owner on Oct 25, 2022. It is now read-only.

Commit

Permalink
[JENKINS] Fix release (#205)
Browse files Browse the repository at this point in the history
* Refs #142010 - Optimize Volto-addons gitflow pipelines

* Revert to older version of slate-react

without the breaking API change

* Upgrade slate and slate-react versions

which brings up the problem with the breaking API change in Slate-React:
ianstormtaylor/slate#4540

* Split text block editor components in separate modules

* [JENKINS] Fix eslint

* Make it work with new react-slate method of getting the value

* Multiple Description blocks on the same page update each other

In fact, does the changes to the SlateEditor component for the
Slate-based Title & Description blocks too.

* Remove useless commented line

* Backwards block merge 2 (#195)

* Solve bug when merging blocks with Backspace

* Remove some dead code

* Update Jest snapshots

* Update Jest snapshots

Co-authored-by: Silviu Bogan <[email protected]>

* Automated release 5.1.2

* [JENKINS] Refs #142010 - Optimize Volto-addons gitflow pipelines

* Automated release 5.1.3

Co-authored-by: valentinab25 <valentinab25>
Co-authored-by: Silviu Bogan <[email protected]>
Co-authored-by: Tiberiu Ichim <[email protected]>
Co-authored-by: Alin Voinea <[email protected]>
Co-authored-by: Tiberiu Ichim <[email protected]>
Co-authored-by: EEA Jenkins <@users.noreply.github.com>
  • Loading branch information
5 people authored Dec 5, 2021
1 parent 1fc4ad3 commit 5b772ea
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ 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).

#### [5.1.2](https://github.com/eea/volto-slate/compare/5.1.1...5.1.2)
#### [5.1.3](https://github.com/eea/volto-slate/compare/5.1.2...5.1.3)

- Backwards block merge 2 [`#195`](https://github.com/eea/volto-slate/pull/195)
- Upgrade slate and slate-react versions [`#196`](https://github.com/eea/volto-slate/pull/196)
Expand All @@ -15,6 +15,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Revert to older version of slate-react [`044fadf`](https://github.com/eea/volto-slate/commit/044fadf592dc71a5756e82a94a98df0ba0b8c7ac)
- Refs #142010 - Optimize Volto-addons gitflow pipelines [`33bc1ed`](https://github.com/eea/volto-slate/commit/33bc1edeb63ee0d0e6fb8fa6c170d11ed4922a3d)

#### [5.1.2](https://github.com/eea/volto-slate/compare/5.1.1...5.1.2)

> 30 November 2021
- Develop [`#202`](https://github.com/eea/volto-slate/pull/202)

#### [5.1.1](https://github.com/eea/volto-slate/compare/5.1.0...5.1.1)

> 18 November 2021
Expand Down
36 changes: 17 additions & 19 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,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 {
Expand Down Expand Up @@ -48,7 +65,6 @@ pipeline {
when {
allOf {
environment name: 'CHANGE_ID', value: ''
not { branch 'master' }
not { changelog '.*^Automated release [0-9\\.]+$' }
}
}
Expand Down Expand Up @@ -94,7 +110,6 @@ pipeline {
when {
allOf {
environment name: 'CHANGE_ID', value: ''
not { branch 'master' }
not { changelog '.*^Automated release [0-9\\.]+$' }
}
}
Expand Down Expand Up @@ -193,23 +208,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 {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "volto-slate",
"version": "5.1.2",
"version": "5.1.3",
"description": "Slate.js integration with Volto",
"main": "src/index.js",
"author": "European Environment Agency: IDM2 A-Team",
Expand Down

0 comments on commit 5b772ea

Please sign in to comment.