@eeacms/volto-clms-theme 1.0.39 → 1.0.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +10 -0
- package/Jenkinsfile +28 -5
- package/package.json +5 -3
package/CHANGELOG.md
CHANGED
|
@@ -4,8 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
|
4
4
|
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
6
6
|
|
|
7
|
+
#### [1.0.40](https://github.com/eea/volto-clms-theme/compare/1.0.39...1.0.40)
|
|
8
|
+
|
|
9
|
+
- Revert "Revert "add volto-form-block"" [`#124`](https://github.com/eea/volto-clms-theme/pull/124)
|
|
10
|
+
- Revert "add volto-form-block" [`#123`](https://github.com/eea/volto-clms-theme/pull/123)
|
|
11
|
+
- add volto-form-block [`#122`](https://github.com/eea/volto-clms-theme/pull/122)
|
|
12
|
+
- Refs #142010 - Optimize Volto-addons gitflow pipelines [`1cce7fa`](https://github.com/eea/volto-clms-theme/commit/1cce7fa8300afb67ca6e01a93acdc66649b505cd)
|
|
13
|
+
|
|
7
14
|
#### [1.0.39](https://github.com/eea/volto-clms-theme/compare/1.0.38...1.0.39)
|
|
8
15
|
|
|
16
|
+
> 23 November 2021
|
|
17
|
+
|
|
18
|
+
- Develop [`#118`](https://github.com/eea/volto-clms-theme/pull/118)
|
|
9
19
|
- Tab Hash [`#121`](https://github.com/eea/volto-clms-theme/pull/121)
|
|
10
20
|
- Volto-clms-utils [`#120`](https://github.com/eea/volto-clms-theme/pull/120)
|
|
11
21
|
- Style fixes [`#119`](https://github.com/eea/volto-clms-theme/pull/119)
|
package/Jenkinsfile
CHANGED
|
@@ -11,6 +11,13 @@ pipeline {
|
|
|
11
11
|
stages {
|
|
12
12
|
|
|
13
13
|
stage('Code') {
|
|
14
|
+
when {
|
|
15
|
+
allOf {
|
|
16
|
+
environment name: 'CHANGE_ID', value: ''
|
|
17
|
+
not { branch 'master' }
|
|
18
|
+
not { changelog '.*^Automated release [0-9\\.]+$' }
|
|
19
|
+
}
|
|
20
|
+
}
|
|
14
21
|
steps {
|
|
15
22
|
parallel(
|
|
16
23
|
|
|
@@ -36,6 +43,13 @@ pipeline {
|
|
|
36
43
|
}
|
|
37
44
|
|
|
38
45
|
stage('Tests') {
|
|
46
|
+
when {
|
|
47
|
+
allOf {
|
|
48
|
+
environment name: 'CHANGE_ID', value: ''
|
|
49
|
+
not { branch 'master' }
|
|
50
|
+
not { changelog '.*^Automated release [0-9\\.]+$' }
|
|
51
|
+
}
|
|
52
|
+
}
|
|
39
53
|
steps {
|
|
40
54
|
parallel(
|
|
41
55
|
|
|
@@ -75,6 +89,13 @@ pipeline {
|
|
|
75
89
|
}
|
|
76
90
|
|
|
77
91
|
stage('Integration tests') {
|
|
92
|
+
when {
|
|
93
|
+
allOf {
|
|
94
|
+
environment name: 'CHANGE_ID', value: ''
|
|
95
|
+
not { branch 'master' }
|
|
96
|
+
not { changelog '.*^Automated release [0-9\\.]+$' }
|
|
97
|
+
}
|
|
98
|
+
}
|
|
78
99
|
steps {
|
|
79
100
|
parallel(
|
|
80
101
|
|
|
@@ -122,11 +143,13 @@ pipeline {
|
|
|
122
143
|
}
|
|
123
144
|
|
|
124
145
|
stage('Report to SonarQube') {
|
|
125
|
-
// Exclude Pull-Requests
|
|
126
146
|
when {
|
|
127
|
-
allOf {
|
|
128
147
|
environment name: 'CHANGE_ID', value: ''
|
|
129
|
-
|
|
148
|
+
anyOf {
|
|
149
|
+
branch 'master'
|
|
150
|
+
branch 'develop'
|
|
151
|
+
}
|
|
152
|
+
not { changelog '.*^Automated release [0-9\\.]+$' }
|
|
130
153
|
}
|
|
131
154
|
steps {
|
|
132
155
|
node(label: 'swarm') {
|
|
@@ -156,8 +179,8 @@ pipeline {
|
|
|
156
179
|
steps {
|
|
157
180
|
node(label: 'docker') {
|
|
158
181
|
script {
|
|
159
|
-
if ( env.CHANGE_BRANCH != "develop"
|
|
160
|
-
error "Pipeline aborted due to PR not made from develop
|
|
182
|
+
if ( env.CHANGE_BRANCH != "develop" ) {
|
|
183
|
+
error "Pipeline aborted due to PR not made from develop branch"
|
|
161
184
|
}
|
|
162
185
|
withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
|
|
163
186
|
sh '''docker pull eeacms/gitflow'''
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eeacms/volto-clms-theme",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.40",
|
|
4
4
|
"description": "volto-clms-theme: Volto theme for CLMS site",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"author": "CodeSyntax for the European Environment Agency",
|
|
@@ -25,7 +25,8 @@
|
|
|
25
25
|
"@eeacms/volto-metadata-block",
|
|
26
26
|
"@eeacms/volto-resize-helper",
|
|
27
27
|
"@eeacms/volto-tabs-block",
|
|
28
|
-
"@eeacms/volto-clms-utils"
|
|
28
|
+
"@eeacms/volto-clms-utils",
|
|
29
|
+
"volto-form-block"
|
|
29
30
|
],
|
|
30
31
|
"dependencies": {
|
|
31
32
|
"@eeacms/volto-tabs-block": "1.2.7",
|
|
@@ -43,7 +44,8 @@
|
|
|
43
44
|
"react-svg": "14.0.4",
|
|
44
45
|
"@eeacms/volto-arcgis-block": "*",
|
|
45
46
|
"react-native-mime-types": "2.3.0",
|
|
46
|
-
"@eeacms/volto-clms-utils": "0.1.1"
|
|
47
|
+
"@eeacms/volto-clms-utils": "0.1.1",
|
|
48
|
+
"volto-form-block": "2.1.0"
|
|
47
49
|
},
|
|
48
50
|
"devDependencies": {
|
|
49
51
|
"eslint": "^6.8.0",
|