Skip to content

Commit 22e9fad

Browse files
authored
Merge pull request #4 from eea/develop
Release
2 parents ce9384c + 907a128 commit 22e9fad

File tree

7 files changed

+17
-21
lines changed

7 files changed

+17
-21
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
### [0.2.0](https://github.com/eea/ied-frontend/compare/0.1.0...0.2.0) - 12 March 2025
8+
9+
#### :house: Internal changes
10+
11+
- chore: [JENKINS] fix release command [valentinab25 - [`416ae1f`](https://github.com/eea/ied-frontend/commit/416ae1f6a0754f8fbcbd4869e09dcf5a0b50dc27)]
12+
13+
#### :hammer_and_wrench: Others
14+
15+
- styles [dobri1408 - [`9678d5f`](https://github.com/eea/ied-frontend/commit/9678d5fe9254d14df3bc7cdfdb087b8afe40a750)]
716
### [0.1.0](https://github.com/eea/ied-frontend/compare/0.0.2...0.1.0) - 11 March 2025
817

918
#### :hammer_and_wrench: Others

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ pipeline {
219219
}
220220
steps{
221221
node(label: 'docker') {
222-
withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) {
223-
sh '''docker pull eeacms/gitflow; docker run -i --rm --name="${BUILD_TAG}-release" -e GIT_TOKEN="${GITHUB_TOKEN}" -e RANCHER_CATALOG_PATH="${template}" -e DOCKER_IMAGEVERSION="${BRANCH_NAME}" -e DOCKER_IMAGENAME="${registry}" --entrypoint /add_rancher_catalog_entry.sh eeacms/gitflow'''
222+
withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'), usernamePassword(credentialsId: 'jekinsdockerhub', usernameVariable: 'DOCKERHUB_USER', passwordVariable: 'DOCKERHUB_PASS')]) {
223+
sh '''docker pull eeacms/gitflow; docker run -i --rm --name="$BUILD_TAG-release" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_NAME="$GIT_NAME" -e DOCKERHUB_REPO="$registry" -e GIT_TOKEN="$GITHUB_TOKEN" -e DOCKERHUB_USER="$DOCKERHUB_USER" -e DOCKERHUB_PASS="$DOCKERHUB_PASS" -e DEPENDENT_DOCKERFILE_URL="$DEPENDENT_DOCKERFILE_URL" -e RANCHER_CATALOG_PATHS="$template" -e GITFLOW_BEHAVIOR="RUN_ON_TAG" eeacms/gitflow'''
224224
}
225225
}
226226
}

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "ied-frontend",
33
"description": "",
44
"license": "MIT",
5-
"version": "0.1.0",
5+
"version": "0.2.0",
66
"scripts": {
77
"start": "razzle start",
88
"postinstall": "make omelette && make patches",
@@ -51,6 +51,7 @@
5151
"@eeacms/volto-eea-design-system",
5252
"@eeacms/volto-eea-website-theme",
5353
"@eeacms/volto-ied-policy",
54+
"@eeacms/volto-block-style",
5455
"volto-subsites"
5556
],
5657
"jest": {
@@ -158,6 +159,7 @@
158159
"@eeacms/volto-eea-kitkat": "*",
159160
"@eeacms/volto-ied-policy": "*",
160161
"@eeacms/volto-eea-website-theme": "*",
162+
"@eeacms/volto-block-style": "*",
161163
"volto-subsites": "4.0.0",
162164
"react": "17.0.2",
163165
"react-dom": "17.0.2",
@@ -167,6 +169,7 @@
167169
"eslint-plugin-jsx-a11y": "6.7.1"
168170
},
169171
"dependencies": {
172+
"@eeacms/volto-block-style": "*",
170173
"@eeacms/volto-eea-design-system": "*",
171174
"@eeacms/volto-eea-kitkat": "*",
172175
"@eeacms/volto-eea-website-theme": "*",

src/constants copy/ActionTypes.js

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/constants copy/index.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/constants copy/query.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

yarn.lock

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2048,7 +2048,7 @@ __metadata:
20482048
languageName: node
20492049
linkType: hard
20502050

2051-
"@eeacms/volto-block-style@npm:*, @eeacms/volto-block-style@npm:7.2.1":
2051+
"@eeacms/volto-block-style@npm:*":
20522052
version: 7.2.1
20532053
resolution: "@eeacms/volto-block-style@npm:7.2.1"
20542054
dependencies:
@@ -17479,6 +17479,7 @@ __metadata:
1747917479
version: 0.0.0-use.local
1748017480
resolution: "ied-frontend@workspace:."
1748117481
dependencies:
17482+
"@eeacms/volto-block-style": "*"
1748217483
"@eeacms/volto-eea-design-system": "*"
1748317484
"@eeacms/volto-eea-kitkat": "*"
1748417485
"@eeacms/volto-eea-website-theme": "*"

0 commit comments

Comments
 (0)