@eeacms/volto-n2k 0.1.1 → 0.1.2

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.
Files changed (8) hide show
  1. package/CHANGELOG.md +8 -1
  2. package/Jenkinsfile +51 -20
  3. package/package.json +1 -1
  4. package/src/components/manage/Blocks/ExplodedPiesChart/style.less +1 -1
  5. package/src/components/manage/Blocks/HabitatsBanner/style.less +2 -2
  6. package/src/components/manage/Blocks/SiteBanner/style.less +4 -4
  7. package/src/components/manage/Blocks/SiteProtectedHabitats/style.less +1 -1
  8. package/src/components/manage/Blocks/SpeciesBanner/style.less +2 -2
package/CHANGELOG.md CHANGED
@@ -4,8 +4,16 @@ 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
+ #### [0.1.2](https://github.com/eea/volto-n2k/compare/0.1.1...0.1.2)
8
+
9
+ - [Webscore fix] Added generic font-family [`48f7eb5`](https://github.com/eea/volto-n2k/commit/48f7eb59c956a1705579ec1796160d31fad77f96)
10
+ - Refs #142010 - Optimize Volto-addons gitflow pipelines [`7eea1ed`](https://github.com/eea/volto-n2k/commit/7eea1ed2f0360830658266cc44ce9a5de6381776)
11
+
7
12
  #### [0.1.1](https://github.com/eea/volto-n2k/compare/0.1.0...0.1.1)
8
13
 
14
+ > 5 October 2021
15
+
16
+ - Cypress coverage [`#2`](https://github.com/eea/volto-n2k/pull/2)
9
17
  - Update [`0ef14ec`](https://github.com/eea/volto-n2k/commit/0ef14ec745d6642f3c45f7f5b4138e210329e60c)
10
18
  - Bumped versions; [`94e98ab`](https://github.com/eea/volto-n2k/commit/94e98ab1c21b7b25b5383d62398ed01a02c5cbc9)
11
19
  - Update [`854a980`](https://github.com/eea/volto-n2k/commit/854a98070c034c402c85bf35eaa4e881fd8d6e9b)
@@ -68,7 +76,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
68
76
  - update height for iframe (embeded maps) [`5563e6f`](https://github.com/eea/volto-n2k/commit/5563e6fd5df4c201909dd7af90cf6d06eab0a97b)
69
77
  - add common name in species list - sdf [`a2bbb1b`](https://github.com/eea/volto-n2k/commit/a2bbb1b6586c1efb5f7f73e0269f6f96e1250806)
70
78
  - Add jest configuration [`0ae3e0c`](https://github.com/eea/volto-n2k/commit/0ae3e0cd4926cf2e8cad672a24109dd5428473aa)
71
- - Cypress coverage [`467099d`](https://github.com/eea/volto-n2k/commit/467099d11c4bf9e6882049e0ac356314debc0cd1)
72
79
 
73
80
  #### 0.1.0
74
81
 
package/Jenkinsfile CHANGED
@@ -10,7 +10,31 @@ pipeline {
10
10
 
11
11
  stages {
12
12
 
13
+ stage('Release') {
14
+ when {
15
+ allOf {
16
+ environment name: 'CHANGE_ID', value: ''
17
+ branch 'master'
18
+ }
19
+ }
20
+ steps {
21
+ node(label: 'docker') {
22
+ withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),string(credentialsId: 'eea-jenkins-npm-token', variable: 'NPM_TOKEN')]) {
23
+ sh '''docker pull eeacms/gitflow'''
24
+ 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'''
25
+ }
26
+ }
27
+ }
28
+ }
29
+
13
30
  stage('Code') {
31
+ when {
32
+ allOf {
33
+ environment name: 'CHANGE_ID', value: ''
34
+ not { changelog '.*^Automated release [0-9\\.]+$' }
35
+ not { branch 'master' }
36
+ }
37
+ }
14
38
  steps {
15
39
  parallel(
16
40
 
@@ -36,6 +60,15 @@ pipeline {
36
60
  }
37
61
 
38
62
  stage('Tests') {
63
+ when {
64
+ allOf {
65
+ environment name: 'CHANGE_ID', value: ''
66
+ anyOf {
67
+ not { changelog '.*^Automated release [0-9\\.]+$' }
68
+ branch 'master'
69
+ }
70
+ }
71
+ }
39
72
  steps {
40
73
  parallel(
41
74
 
@@ -75,6 +108,15 @@ pipeline {
75
108
  }
76
109
 
77
110
  stage('Integration tests') {
111
+ when {
112
+ allOf {
113
+ environment name: 'CHANGE_ID', value: ''
114
+ anyOf {
115
+ not { changelog '.*^Automated release [0-9\\.]+$' }
116
+ branch 'master'
117
+ }
118
+ }
119
+ }
78
120
  steps {
79
121
  parallel(
80
122
 
@@ -122,10 +164,16 @@ pipeline {
122
164
  }
123
165
 
124
166
  stage('Report to SonarQube') {
125
- // Exclude Pull-Requests
126
167
  when {
127
168
  allOf {
128
169
  environment name: 'CHANGE_ID', value: ''
170
+ anyOf {
171
+ branch 'master'
172
+ allOf {
173
+ branch 'develop'
174
+ not { changelog '.*^Automated release [0-9\\.]+$' }
175
+ }
176
+ }
129
177
  }
130
178
  }
131
179
  steps {
@@ -156,8 +204,8 @@ pipeline {
156
204
  steps {
157
205
  node(label: 'docker') {
158
206
  script {
159
- if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) {
160
- error "Pipeline aborted due to PR not made from develop or hotfix branch"
207
+ if ( env.CHANGE_BRANCH != "develop" ) {
208
+ error "Pipeline aborted due to PR not made from develop branch"
161
209
  }
162
210
  withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
163
211
  sh '''docker pull eeacms/gitflow'''
@@ -168,23 +216,6 @@ pipeline {
168
216
  }
169
217
  }
170
218
 
171
- stage('Release') {
172
- when {
173
- allOf {
174
- environment name: 'CHANGE_ID', value: ''
175
- branch 'master'
176
- }
177
- }
178
- steps {
179
- node(label: 'docker') {
180
- withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),string(credentialsId: 'eea-jenkins-npm-token', variable: 'NPM_TOKEN')]) {
181
- sh '''docker pull eeacms/gitflow'''
182
- 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'''
183
- }
184
- }
185
- }
186
- }
187
-
188
219
  }
189
220
 
190
221
  post {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@eeacms/volto-n2k",
3
- "version": "0.1.1",
3
+ "version": "0.1.2",
4
4
  "description": "volto-n2k: Volto add-on",
5
5
  "main": "src/index.js",
6
6
  "author": "European Environment Agency: IDM2 A-Team",
package/src/components/manage/Blocks/ExplodedPiesChart/style.less CHANGED
@@ -44,7 +44,7 @@
44
44
  overflow: hidden;
45
45
  width: 100%;
46
46
  color: #013c60;
47
- font-family: 'OpenSans', arial;
47
+ font-family: 'OpenSans', 'Helvetica Neue', Arial, Helvetica, sans-serif;
48
48
  font-size: 12px;
49
49
  font-weight: 600;
50
50
  text-overflow: ellipsis;
package/src/components/manage/Blocks/HabitatsBanner/style.less CHANGED
@@ -6,7 +6,7 @@ div#view .habitat-banner-details .ui.container > * {
6
6
  padding: 1.5em 0;
7
7
  background-color: #04a77d;
8
8
  color: #fff;
9
- font-family: 'RajdhaniB';
9
+ font-family: 'RajdhaniB', 'Helvetica Neue', Arial, Helvetica, sans-serif;
10
10
 
11
11
  .habitat-details {
12
12
  display: flex;
@@ -33,7 +33,7 @@ div#view .habitat-banner-details .ui.container > * {
33
33
  }
34
34
 
35
35
  .info {
36
- font-family: 'RajdhaniR';
36
+ font-family: 'RajdhaniR', 'Helvetica Neue', Arial, Helvetica, sans-serif;
37
37
  font-size: 18px;
38
38
  font-weight: 600;
39
39
  line-height: 18px;
package/src/components/manage/Blocks/SiteBanner/style.less CHANGED
@@ -2,7 +2,7 @@
2
2
  padding: 1.5em 0;
3
3
  background-color: #04a77d;
4
4
  color: #fff;
5
- font-family: 'RajdhaniB';
5
+ font-family: 'RajdhaniB', 'Helvetica Neue', Arial, Helvetica, sans-serif;
6
6
 
7
7
  .ui.container > * {
8
8
  margin-bottom: 0 !important;
@@ -26,7 +26,7 @@
26
26
  display: flex;
27
27
  align-items: center;
28
28
  margin-bottom: 0.5rem;
29
- font-family: 'RajdhaniR';
29
+ font-family: 'RajdhaniR', 'Helvetica Neue', Arial, Helvetica, sans-serif;
30
30
  font-size: 18px;
31
31
  font-weight: 600;
32
32
  line-height: 18px;
@@ -55,7 +55,7 @@
55
55
  max-width: 0;
56
56
  margin-left: -1rem;
57
57
  color: #eb9700;
58
- font-family: 'RajdhaniR';
58
+ font-family: 'RajdhaniR', 'Helvetica Neue', Arial, Helvetica, sans-serif;
59
59
  font-size: 14px;
60
60
  line-height: 14px;
61
61
  transition: max-width 0.3s;
@@ -73,7 +73,7 @@
73
73
  }
74
74
 
75
75
  .site-designation {
76
- font-family: 'RajdhaniR';
76
+ font-family: 'RajdhaniR', 'Helvetica Neue', Arial, Helvetica, sans-serif;
77
77
  font-size: 18px;
78
78
  font-weight: 400;
79
79
  line-height: 18px;
package/src/components/manage/Blocks/SiteProtectedHabitats/style.less CHANGED
@@ -14,7 +14,7 @@ div#view .ui.container.habitats-wrapper > * {
14
14
  background-position: center;
15
15
  background-repeat: no-repeat;
16
16
  background-size: cover;
17
- font-family: 'RajdhaniB';
17
+ font-family: 'RajdhaniB', 'Helvetica Neue', Arial, Helvetica, sans-serif;
18
18
 
19
19
  .habitats-container {
20
20
  position: absolute;
package/src/components/manage/Blocks/SpeciesBanner/style.less CHANGED
@@ -7,7 +7,7 @@ div#view .species-banner-details .ui.container > * {
7
7
  padding: 1.5em 0;
8
8
  background-color: #04a77d;
9
9
  color: #fff;
10
- font-family: 'RajdhaniB';
10
+ font-family: 'RajdhaniB', 'Helvetica Neue', Arial, Helvetica, sans-serif;
11
11
 
12
12
  .species-details {
13
13
  display: flex;
@@ -32,7 +32,7 @@ div#view .species-banner-details .ui.container > * {
32
32
 
33
33
  .info {
34
34
  margin-bottom: 1rem;
35
- font-family: 'RajdhaniR';
35
+ font-family: 'RajdhaniR', 'Helvetica Neue', Arial, Helvetica, sans-serif;
36
36
  font-size: 18px;
37
37
  font-weight: 600;
38
38
  line-height: 18px;