Merge pull request #53 from Jonas56/imp-db-cloud

Add Versioning & branching strategy. Fixes #48

.github/workflows/pipeline.yml

@@ -3,9 +3,9 @@ name: Deployment pipeline
 on:
   push:
     branches:
-      - main
+      - [main, dev]
   pull_request:
-    branches: [main]
+    branches: [main, dev]
     types: [opened, synchronize]
 
 jobs:
@@ -18,12 +18,17 @@ jobs:
           node-version: "14.x"
       - name: Install dependencies
         run: npm run install-app
-      # - name: lint checking
-      #   run: npm run lint
+      - name: lint checking
+        run: npm run lint
       - name: build
         run: npm run build-app
-      # - name: test
-      #   run: npm run test-server
+      - name: test
+        run: npm run test-server
+        env:
+          DB_NAME: ${{ secrets.DB_NAME }}
+          DB_USERNAME: ${{ secrets.DB_USERNAME }}
+          DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
+          DB_HOSTNAME: ${{ secrets.DB_HOSTNAME }}
       # ****End to end Testing***** #
       # - name: e2e tests
       #   uses: cypress-io/github-action@v2
@@ -32,17 +37,19 @@ jobs:
       #     start: npm run start-prod
       #     wait-on: http://localhost:5000
       - name: Deploy
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.base_ref == 'main' }}
         uses: akhileshns/[email protected] # This is the action
         with:
           heroku_api_key: ${{secrets.HEROKU_API_KEY}}
-          heroku_app_name: "law-firm-management-sys" #Must be unique in Heroku
+          heroku_app_name: "law-firm-management-sys" # Must be unique in Heroku
           heroku_email: "[email protected]"
           # healthcheck: "law-firm-management-sys.herokuapp.com/version"
           # checkString: "1.1.0"
-      # - name: Bump version and push tag
-      #   if: ${{ github.event_name == 'push' }}
-      #   uses: anothrNick/[email protected]
-      #   env:
-      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #     WITH_V: true
+
+      - name: Bump version and push tag
+        if: ${{ github.base_ref == 'main' }}
+        uses: anothrNick/[email protected]
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          WITH_V: true
+

server/.eslintrc.js

@@ -13,6 +13,7 @@ module.exports = {
   },
   rules: {
     indent: ["error", 2],
+    "linebreak-style": ["error", "windows"],
     quotes: ["error", "double"],
     semi: ["error", "always"],
     eqeqeq: "error",