Skip to content

Commit

Permalink
Add Versioning & branching strategy. Fixes #48
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas56 committed Dec 11, 2021
1 parent 8bc8476 commit ad64049
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 27 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/DeployementNotification.yml

This file was deleted.

23 changes: 14 additions & 9 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Deployment pipeline
on:
push:
branches:
- main
- [main, dev]
pull_request:
branches: [main]
branches: [main, dev]
types: [opened, synchronize]

jobs:
Expand All @@ -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
Expand All @@ -32,16 +37,16 @@ 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' }}
if: ${{ github.base_ref == 'main' }}
uses: anothrNick/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions server/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ module.exports = {
},
rules: {
indent: ["error", 2],
"linebreak-style": ["error", "windows"],
quotes: ["error", "double"],
semi: ["error", "always"],
eqeqeq: "error",
Expand Down

0 comments on commit ad64049

Please sign in to comment.