Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature #4

Merged
merged 8 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 15 additions & 28 deletions .github/workflows/fromfeaturetodevelop.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Feature to Develop to Push
name: Feature to Develop

on:
push:
Expand All @@ -7,41 +7,28 @@ on:

jobs:
build-and-test:
runs-on: ubuntu-latest
runs-on: ubuntu-latest # You can change the runner environment if needed

steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Checkout code
uses: actions/checkout@v2 # This step checks out your repository's code

- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: 14
node-version: '16'

- name: Install Dependencies
- name: Install dependencies
run: npm install

- name: Build and Test
run: |
npm run build --if-present
npm run test --if-present
- name: Build
run: npm run build --if-present

merge-and-push:
runs-on: ubuntu-latest
needs: build-and-test
- name: Run tests
run: npm run test --if-present

steps:
- name: Checkout Repository
uses: actions/checkout@v2

- name: Create and Checkout Develop Branch
run: |
git config user.name "Waterclone"
git config user.email "jene@missionreadyhq.com"
git checkout -b develop
git push origin develop

- name: Merge Feature into Develop
run: |
git merge --no-ff ${{ github.event.before }}
git push origin develop
- name: Push to develop
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: develop
10 changes: 5 additions & 5 deletions coverage/clover.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1693337316557" clover="3.2.0">
<project timestamp="1693337316557" name="All files">
<coverage generated="1693342392893" clover="3.2.0">
<project timestamp="1693342392893" name="All files">
<metrics statements="43" coveredstatements="37" conditionals="30" coveredconditionals="24" methods="5" coveredmethods="5" elements="78" coveredelements="66" complexity="0" loc="43" ncloc="43" packages="1" files="3" classes="3"/>
<file name="carValueServices.ts" path="/Users/jimson/Desktop/Final_m3/MR-L5-Mission-3-2/src/services/carValueServices.ts">
<file name="carValueServices.ts" path="/Users/jenehamahona/Documents/Mission Ready/Level 5/Mission 3/MR-L5-Mission3-2/Server/src/services/carValueServices.ts">
<metrics statements="13" coveredstatements="13" conditionals="9" coveredconditionals="9" methods="1" coveredmethods="1"/>
<line num="1" count="1" type="stmt"/>
<line num="2" count="8" type="stmt"/>
Expand All @@ -18,7 +18,7 @@
<line num="20" count="4" type="stmt"/>
<line num="21" count="4" type="stmt"/>
</file>
<file name="quoteServices.ts" path="/Users/jimson/Desktop/Final_m3/MR-L5-Mission-3-2/src/services/quoteServices.ts">
<file name="quoteServices.ts" path="/Users/jenehamahona/Documents/Mission Ready/Level 5/Mission 3/MR-L5-Mission3-2/Server/src/services/quoteServices.ts">
<metrics statements="15" coveredstatements="15" conditionals="9" coveredconditionals="9" methods="2" coveredmethods="2"/>
<line num="1" count="1" type="stmt"/>
<line num="2" count="12" type="cond" truecount="4" falsecount="0"/>
Expand All @@ -36,7 +36,7 @@
<line num="26" count="4" type="stmt"/>
<line num="28" count="4" type="stmt"/>
</file>
<file name="riskServices.ts" path="/Users/jimson/Desktop/Final_m3/MR-L5-Mission-3-2/src/services/riskServices.ts">
<file name="riskServices.ts" path="/Users/jenehamahona/Documents/Mission Ready/Level 5/Mission 3/MR-L5-Mission3-2/Server/src/services/riskServices.ts">
<metrics statements="15" coveredstatements="9" conditionals="12" coveredconditionals="6" methods="2" coveredmethods="2"/>
<line num="1" count="1" type="stmt"/>
<line num="2" count="1" type="cond" truecount="3" falsecount="1"/>
Expand Down
Loading
Loading