Skip to content

Commit

Permalink
Merge branch 'release/1.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
steve-lebleu committed Jun 7, 2021
2 parents 1ad9649 + bb6cdde commit 916879b
Show file tree
Hide file tree
Showing 6 changed files with 90 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/main.yml → .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: Typeplate CI / CD pipeline
name: Build
on:
push:
branches: [ master ]
branches: [ dev, main, hotfix/*, feature/*, release/* ]
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
RUNNER: github
Expand Down
74 changes: 74 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
name: Release
on:
push:
tags:
- v*
jobs:
build:
name: Build
runs-on: ubuntu-latest
env:
RUNNER: github
NODE_ENV: test
steps:
- name: Github checkout
uses: actions/checkout@v2
- name: Setup node.js environment
uses: actions/setup-node@v1
with:
node-version: '14.16'
- name: Setup MySQL server
uses: mirromutth/[email protected]
with:
mysql version: '5.7'
mysql database: 'typeplate_test'
mysql root password: passw0rd
- name: Create directories
run: mkdir -p ./dist/env && cp ./src/env/template.env ./dist/env/test.env
- name: Setup .env file
run: |
echo FACEBOOK_CONSUMER_ID = "${{ secrets.FACEBOOK_CONSUMER_ID }}" >> ./dist/env/test.env
echo FACEBOOK_CONSUMER_SECRET = "${{ secrets.FACEBOOK_CONSUMER_SECRET }}" >> ./dist/env/test.env
echo GITHUB_CONSUMER_ID = "${{ secrets.GTHB_CONSUMER_ID }}" >> ./dist/env/test.env
echo GITHUB_CONSUMER_SECRET = "${{ secrets.GTHB_CONSUMER_SECRET }}" >> ./dist/env/test.env
echo GOOGLE_CONSUMER_ID = "${{ secrets.GOOGLE_CONSUMER_ID }}" >> ./dist/env/test.env
echo GOOGLE_CONSUMER_SECRET = "${{ secrets.GOOGLE_CONSUMER_SECRET }}" >> ./dist/env/test.env
echo LINKEDIN_CONSUMER_ID = "${{ secrets.LINKEDIN_CONSUMER_ID }}" >> ./dist/env/test.env
echo LINKEDIN_CONSUMER_SECRET = "${{ secrets.LINKEDIN_CONSUMER_SECRET }}" >> ./dist/env/test.env
- name: Install global dependencies
run: npm i typescript -g && npm i typeorm -g
- name: Install local dependencies
run: npm i
- name: Compile Typescript files
run: tsc
- name: Synchronize database schema
run: typeorm schema:sync
- name: Execute tests sets
run: npm run ci:test
- name: Publish to coveralls.io
uses: coverallsapp/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
path-to-lcov: ./reports/coverage/lcov.info
release:
name: Release on Github
runs-on: ubuntu-latest
needs: [ build ]
steps:
- name: Cache dependencies
uses: actions/cache@v2
with:
path: '**/node_modules'
key: node-modules-${{ hashfiles('**/package-lock.json') }}
- name: Github checkout
uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup node.js environment
uses: actions/setup-node@v1
with:
node-version: '14.16'
- name: Create release
uses: konfer-be/[email protected]
with:
token: ${{ secrets.GITHUB_TOKEN }}
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,19 @@ 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.17](https://github.com/konfer-be/typeplate/compare/v1.4.16...v1.4.17)
## [v1.5.0](https://github.com/konfer-be/typeplate/compare/v1.4.17...v1.5.0)

### Commits

- Introduce open source workflow [`ea22c07`](https://github.com/konfer-be/typeplate/commit/ea22c07f41c7615dd46b1efea8f99eb8de9cfd35)
- Trigger pipeline on new tag instead of push [`b8df922`](https://github.com/konfer-be/typeplate/commit/b8df9227ed60c6fcb200b8804d3959f507967a1d)
- Improve syntax of schema [`68a3462`](https://github.com/konfer-be/typeplate/commit/68a346201c55750ef11840298ee41142375e7450)

## [v1.4.17](https://github.com/konfer-be/typeplate/compare/v1.4.16...v1.4.17) - 2021-06-04

### Commits

- Update changelog [`1ad9649`](https://github.com/konfer-be/typeplate/commit/1ad9649626c46077a49999ddfe51d432e4a51e99)
- Test [`3f8d370`](https://github.com/konfer-be/typeplate/commit/3f8d3702faf1f3f9d78b2b24238dbf4eeb5daf8e)
- Test [`38d495c`](https://github.com/konfer-be/typeplate/commit/38d495c27c8e0b705343eac56bbe28cce910da53)
- Debug testing [`71e7efb`](https://github.com/konfer-be/typeplate/commit/71e7efb25cef51f07faa487dd60e8484aea26d3b)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![Typeorm](https://img.shields.io/badge/Typeorm-0.2.33-informational?logo=typeorm&color=FFAB00)](https://typeorm.io/#/)
[![Mocha](https://img.shields.io/badge/Mocha-8.0.3-informational?logo=mocha&color=8A6343)](https://mochajs.org)

[![Typeplate CI / CD pipeline](https://github.com/konfer-be/typeplate/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/konfer-be/typeplate/actions/workflows/main.yml)
[![Build](https://github.com/konfer-be/typeplate/actions/workflows/main.yml/badge.svg?branch=master)](https://github.com/konfer-be/typeplate/actions/workflows/main.yml)
[![Coverage Status](https://coveralls.io/repos/github/konfer-be/typeplate/badge.svg?branch=master)](https://coveralls.io/github/konfer-be/typeplate?branch=master)
![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/konfer-be/typeplate/master)
![Requires.io (branch)](https://img.shields.io/requires/github/konfer-be/typeplate/master)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.4.17",
"version": "1.5.0",
"engines": {
"node": ">=14.16",
"npm": ">=6.14.11"
Expand Down
2 changes: 1 addition & 1 deletion src/api/core/types/schemas/file.schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const file = (field_name: Fieldname): AnySchema => {
owner: Joi.number().required(),
createdAt: Joi.date().optional().allow(null),
updatedAt: Joi.date().optional().allow(null),
deletedAt: Joi.date().optional().allow(null),
deletedAt: Joi.date().optional().allow(null)
});
};

Expand Down

0 comments on commit 916879b

Please sign in to comment.