Skip to content

Commit

Permalink
chore(release): use lerna-changelog and not conventional-commits - EU…
Browse files Browse the repository at this point in the history
…BFR-199 (#151)

Removes older per-package change logs and keeps only the root one.
Changes the base for generating the change log differences to be tags.
  • Loading branch information
kalinchernev authored and yhuard committed Aug 1, 2018
1 parent 7971c27 commit 9a3a4c2
Show file tree
Hide file tree
Showing 39 changed files with 350 additions and 757 deletions.
14 changes: 8 additions & 6 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,16 @@ Please fill in the description following the template.

## Release process

1. Each merged PR should have followed the Git conventions.
1. Each merged PR should be labeled with one of the [labels](https://github.com/ec-europa/eubfr-data-lake/labels) named `tag: ...` to indicate what kind of change it is.

2. Pull the latest `master` branch.
2. Pull the latest `master` and branch out to a release branch `chore/release-x`

3. **Do not run `npm publish`. Instead, run `npm run publish`.**
3. Create a change log entry for the release by running `npm run changelog`. The command will find all the labeled pull requests merged since the last release and create a change log entry with all the changes and links to PRs and their authors. Copy and paste it to the top of `CHANGELOG.md`.

4. The CLI will ask for a confirmation about the new package versions. Please verify them carefully before accepting.
4. **Run `npm run publish` (NOT `npm publish`)**

5. Once you have accepted, the script will generate the necessary changes in the CHANGELOG files.
5. The CLI will ask for a confirmation about the new package versions. Please verify them carefully before accepting.

6. Commit generated change log files and possibly reuse the information making a new release.
6. Once you have accepted, the script will increment lerna (project) version and the version of the packages changed.

7. Commit changes in the release branch and open a pull request. When it's merged, create a new release on GitHub.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.changelog
.content
.env
.serverless
Expand Down
180 changes: 98 additions & 82 deletions CHANGELOG.md

Large diffs are not rendered by default.

27 changes: 0 additions & 27 deletions demo/dashboard/client/CHANGELOG.md

This file was deleted.

2 changes: 1 addition & 1 deletion demo/dashboard/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@eubfr/demo-dashboard-client",
"version": "0.1.0",
"version": "0.1.1",
"scripts": {
"start": "run-s prepare react:start",
"build": "npm run prepare && react-scripts build",
Expand Down
20 changes: 0 additions & 20 deletions demo/dashboard/server/CHANGELOG.md

This file was deleted.

22 changes: 0 additions & 22 deletions demo/website/CHANGELOG.md

This file was deleted.

14 changes: 13 additions & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{
"lerna": "2.11.0",
"version": "0.1.0",
"version": "0.1.1",
"npmClient": "yarn",
"useWorkspaces": true,
"changelog": {
"repo": "ec-europa/eubfr-data-lake",
"labels": {
"tag: new feature": ":rocket: New Feature",
"tag: breaking change": ":boom: Breaking Change",
"tag: bug fix": ":bug: Bug Fix",
"tag: enhancement": ":nail_care: Enhancement",
"tag: documentation": ":memo: Documentation",
"tag: internal": ":house: Internal"
},
"cacheDir": ".changelog"
},
"commands": {
"publish": {
"allowBranch": "master",
Expand Down
22 changes: 0 additions & 22 deletions lib/CHANGELOG.md

This file was deleted.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"private": true,
"scripts": {
"bootstrap": "lerna bootstrap",
"changelog": "lerna-changelog",
"content:upload": "eubfr-cli upload",
"content:delete": "eubfr-cli delete",
"deploy": "run-s deploy:resources deploy:services deploy:demo",
Expand Down Expand Up @@ -52,6 +53,7 @@
"gh-pages": "1.1.0",
"husky": "0.14.3",
"lerna": "2.11.0",
"lerna-changelog": "0.8.0",
"lint-staged": "7.1.2",
"npm-run-all": "4.1.3",
"prettier": "1.13.2",
Expand Down
19 changes: 0 additions & 19 deletions plugins/serverless-plugin-elasticsearch-index/CHANGELOG.md

This file was deleted.

31 changes: 0 additions & 31 deletions resources/elasticsearch/CHANGELOG.md

This file was deleted.

12 changes: 0 additions & 12 deletions resources/harmonized-storage/CHANGELOG.md

This file was deleted.

12 changes: 0 additions & 12 deletions resources/raw-storage/CHANGELOG.md

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/deployment/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ if [ -n "$(git status --porcelain)" ]; then
fi

# Publish
npx lerna publish --conventional-commits --skip-git --skip-npm "$@"
npx lerna publish --skip-git --skip-npm "$@"
12 changes: 0 additions & 12 deletions services/compute/stopper/CHANGELOG.md

This file was deleted.

15 changes: 0 additions & 15 deletions services/enrichment/fields/budget/CHANGELOG.md

This file was deleted.

14 changes: 0 additions & 14 deletions services/enrichment/fields/locations/CHANGELOG.md

This file was deleted.

21 changes: 0 additions & 21 deletions services/enrichment/manager/CHANGELOG.md

This file was deleted.

Loading

0 comments on commit 9a3a4c2

Please sign in to comment.