From d54efa03e4baad38935980840eb47d74c4b998a8 Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 23 Apr 2021 19:02:39 +0200 Subject: [PATCH 1/3] Fix CI env variables --- .travis.yml | 4 ++-- src/env/template.env | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b5bbd86..389215e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ node_js: - "14.16" services: mysql before_install: - - mysql -e 'CREATE DATABASE IF NOT EXISTS ts_express_boilerplate_test;' -script: mkdir -p ./dist/logs ./dist/env ./dist/public/archives ./dist/public/documents ./dist/public/audios ./dist/public/videos ./dist/public/images/master-copy ./dist/public/images/rescale/xs ./dist/public/images/rescale/sm ./dist/public/images/rescale/md ./dist/public/images/rescale/lg ./dist/public/images/rescale/xl && cp ./src/env/template.env ./dist/env/development.env && cp ./src/env/template.env ./dist/env/test.env && npm i typescript -g && npm i typeorm -g && npm i && tsc && typeorm schema:sync && env ENVIRONMENT=test env RUNNER=travis npm run ci:test + - mysql -e 'CREATE DATABASE IF NOT EXISTS typeplate_test;' +script: mkdir -p ./dist/logs ./dist/env ./dist/public/archives ./dist/public/documents ./dist/public/audios ./dist/public/videos ./dist/public/images/master-copy ./dist/public/images/rescale && cp ./src/env/template.env ./dist/env/test.env && npm i typescript -g && npm i typeorm -g && npm i && tsc && typeorm schema:sync && npm run ci:test after_success: npm run ci:coverage cache: directories: diff --git a/src/env/template.env b/src/env/template.env index 964bad8..b8bb15d 100644 --- a/src/env/template.env +++ b/src/env/template.env @@ -1,5 +1,5 @@ # Access token secret passphrase -ACCESS_TOKEN_SECRET = "access-token-secret-passphrase" +ACCESS_TOKEN_SECRET = "hello-i-am-an-access-token-secret-passphrase" # Access token duration (3 months in dev, always in minutes) ACCESS_TOKEN_DURATION = 120960 @@ -62,7 +62,7 @@ PORT = 8101 # REFRESH_TOKEN_DURATION = 30 # Refresh token secret -REFRESH_TOKEN_SECRET = "refresh-token-secret-passphrase" +REFRESH_TOKEN_SECRET = "hello-i-am-a-refresh-token-secret-passphrase" # Refresh token lifetime unity of duration hours|days|weeks|months # REFRESH_TOKEN_UNIT = "days" @@ -107,7 +107,7 @@ TYPEORM_TYPE = "mysql" TYPEORM_HOST = "localhost" # Database name. Keep it different from your developement database. -TYPEORM_DB = "ts_express_boilerplate_test" +TYPEORM_DB = "typeplate_test" # Database user TYPEORM_USER = "root" From 57b6a3473d1a8bdd72ce4a40332fe11f9e21d58c Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 23 Apr 2021 19:09:12 +0200 Subject: [PATCH 2/3] Fix DB name --- ormconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ormconfig.json b/ormconfig.json index 9664a4b..7a2c319 100644 --- a/ormconfig.json +++ b/ormconfig.json @@ -5,7 +5,7 @@ "port": 3306, "username": "root", "password": "", - "database": "ts_express_boilerplate_test", + "database": "typeplate_test", "synchronize": true, "logging": false, "entities": [ From 935a5a4761b22e99a96cecba11f666c43fb7b377 Mon Sep 17 00:00:00 2001 From: Steve Date: Fri, 23 Apr 2021 19:21:54 +0200 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 11 ++++++++++- package.json | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a39d44f..931c00a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -## [v1.4.2](https://github.com/konfer-be/typeplate/compare/v1.4.1...v1.4.2) +## [v1.4.3](https://github.com/konfer-be/typeplate/compare/v1.4.2...v1.4.3) ### Commits +- Fix CI env variables [`d54efa0`](https://github.com/konfer-be/typeplate/commit/d54efa03e4baad38935980840eb47d74c4b998a8) +- Fix DB name [`57b6a34`](https://github.com/konfer-be/typeplate/commit/57b6a3473d1a8bdd72ce4a40332fe11f9e21d58c) + +## [v1.4.2](https://github.com/konfer-be/typeplate/compare/v1.4.1...v1.4.2) - 2021-04-23 + +### Commits + +- Resolve conflict [`5990b5f`](https://github.com/konfer-be/typeplate/commit/5990b5ffb888602b2495b98611a2546ead992ee6) - API doc comments review [`af28a0d`](https://github.com/konfer-be/typeplate/commit/af28a0d8ec5b5407751da51f3836e172feb3d123) - Introduce business and data-layer services [`6199665`](https://github.com/konfer-be/typeplate/commit/6199665102193d458d55b543f596ca0f2b47e9fc) - PM2 deploy documentation [`f5f308d`](https://github.com/konfer-be/typeplate/commit/f5f308d3cfa02f2ecd1f16b2e73242c24d5f129e) +- Update changelog [`2b4543a`](https://github.com/konfer-be/typeplate/commit/2b4543a945f80bfb1c63946695dd78eec2089240) ## [v1.4.1](https://github.com/konfer-be/typeplate/compare/v1.4.0...v1.4.1) - 2021-04-21 diff --git a/package.json b/package.json index 1303b18..f043ae7 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "1.4.2", + "version": "1.4.3", "engines": { "node": ">=14.16", "npm": ">=6.14.11"