Skip to content

Commit

Permalink
Merge pull request #85 from eea/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tedw87 authored Feb 7, 2025
2 parents 03f8a17 + 59f2fa3 commit c529eee
Show file tree
Hide file tree
Showing 5 changed files with 5,868 additions and 3,786 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ 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).

### [1.11.0](https://github.com/eea/advisory-board-frontend/compare/1.10.0...1.11.0) - 7 February 2025

#### :rocket: Dependency updates

- Release @eeacms/volto-searchlib@2.0.8 - resolutions [EEA Jenkins - [`cea2224`](https://github.com/eea/advisory-board-frontend/commit/cea22243416ab6c6e7df7d11485a5ed35eaffe7f)]
- Release @eeacms/volto-globalsearch@2.0.4 - resolutions [EEA Jenkins - [`f7d181c`](https://github.com/eea/advisory-board-frontend/commit/f7d181c421bbb09627b4edd27a4cb27aca3a8bb7)]

#### :house: Documentation changes


#### :hammer_and_wrench: Others

- update yarn.lock [Teodor - [`d4c6c00`](https://github.com/eea/advisory-board-frontend/commit/d4c6c00837b6fc5d0b4957be1b7dc4c2aae35954)]
- do not run demo upgrade [valentinab25 - [`c1e8376`](https://github.com/eea/advisory-board-frontend/commit/c1e83765f77f3f468ec2a2c7a49dff1fb6ba19ba)]
### [1.10.0](https://github.com/eea/advisory-board-frontend/compare/1.9.0...1.10.0) - 6 February 2025

#### :rocket: Dependency updates
Expand Down
7 changes: 4 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pipeline {
environment {
RANCHER_STACKID = "1st2549"
RANCHER_ENVID = "1a332957"
RANCHER_STACKID = ""
RANCHER_ENVID = ""
GIT_NAME = "advisory-board-frontend"
registry = "eeacms/advisory-board-frontend"
template = "templates/advisory-board-frontend"
Expand Down Expand Up @@ -230,6 +230,7 @@ pipeline {
stage('Upgrade demo ( on tag )') {
when {
buildingTag()
not { environment name: 'RANCHER_STACKID', value: '' }
}
steps {
node(label: 'docker') {
Expand Down Expand Up @@ -294,4 +295,4 @@ pipeline {
}
}
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Release](https://img.shields.io/github/v/release/eea/advisory-board-frontend?sort=semver)](https://github.com/eea/advisory-board-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/master/lastBuild/display/redirect)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F1.10.0&build=last&subject=release%20v1.10.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/1.10.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fadvisory-board-frontend%2F1.11.0&build=last&subject=release%20v1.11.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/advisory-board-frontend/job/1.11.0/lastBuild/display/redirect/)


## Documentation
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "advisory-board-frontend",
"description": "A Volto-powered Plone frontend",
"license": "MIT",
"version": "1.10.0",
"version": "1.11.0",
"scripts": {
"start": "razzle start",
"postinstall": "make omelette && make patches",
Expand Down Expand Up @@ -150,10 +150,10 @@
"@eeacms/volto-eea-map": "5.0.8",
"@eeacms/volto-eea-versions": "1.0.0",
"@eeacms/volto-eea-website-theme": "3.5.1",
"@eeacms/volto-globalsearch": "2.0.2",
"@eeacms/volto-globalsearch": "2.0.4",
"@eeacms/volto-plotlycharts": "10.0.13",
"@eeacms/volto-redmine-helpdesk": "1.0.0",
"@eeacms/volto-searchlib": "2.0.7",
"@eeacms/volto-searchlib": "2.0.8",
"@eeacms/volto-tableau": "8.1.3",
"@eeacms/volto-workflow-progress": "5.0.0",
"@eeacms/volto-block-data-figure": "8.1.3",
Expand Down Expand Up @@ -207,4 +207,4 @@
"typescript": "5.2.2"
},
"packageManager": "yarn@3.2.3"
}
}
Loading

0 comments on commit c529eee

Please sign in to comment.