diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 9c48e87..4d499f7 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,4 @@ - + ## What changes this PR introduce? diff --git a/.github/workflows/Divlo.yml b/.github/workflows/Divlo.yml index 7202abb..2281fad 100644 --- a/.github/workflows/Divlo.yml +++ b/.github/workflows/Divlo.yml @@ -2,13 +2,12 @@ name: 'Divlo' on: push: - branches: [master] + branches: [master, develop] pull_request: - branches: [master] + branches: [master, develop] jobs: analyze: - name: 'Analyze' runs-on: 'ubuntu-latest' strategy: @@ -35,7 +34,7 @@ jobs: - name: 'Use Node.js' uses: 'actions/setup-node@v2.1.5' with: - node-version: '14.x' + node-version: '16.x' - name: 'Cache dependencies' uses: 'actions/cache@v2.1.6' @@ -60,7 +59,7 @@ jobs: - name: 'Use Node.js' uses: 'actions/setup-node@v2.1.5' with: - node-version: '14.x' + node-version: '16.x' - name: 'Cache dependencies' uses: 'actions/cache@v2.1.6' @@ -85,7 +84,7 @@ jobs: - name: 'Use Node.js' uses: 'actions/setup-node@v2.1.5' with: - node-version: '14.x' + node-version: '16.x' - name: 'Cache dependencies' uses: 'actions/cache@v2.1.6' @@ -109,7 +108,7 @@ jobs: - name: 'Use Node.js' uses: 'actions/setup-node@v2.1.5' with: - node-version: '14.x' + node-version: '16.x' - name: 'Cache dependencies' uses: 'actions/cache@v2.1.6' diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad9def7..9e8bd06 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -49,6 +49,11 @@ Scopes define what part of the code changed. [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/Divlo/Divlo) +### Prerequisites + +- [Node.js](https://nodejs.org/) >= 16 +- [npm](https://www.npmjs.com/) >= 7 + ### Installation ```sh @@ -60,9 +65,18 @@ cd Divlo # Configure environment variables cp .env.example .env + +# Install +npm install ``` -### Development environment with [Docker](https://www.docker.com/) +### Local Development environment + +```sh +npm run dev +``` + +### Production environment with [Docker](https://www.docker.com/) ```sh # Setup and run all the services for you