Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/client/multi-65f1d585e5
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleMcMaster authored Aug 21, 2024
2 parents c78795e + e0d6762 commit 3f60e03
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 69 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]
schedule:
- cron: '00 15 * * 3'

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/policy-dotnetcore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ name: dotnet core - build & test
on:
pull_request:
branches:
- master
- main
push:
branches: [ main ]

jobs:
build:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/policy-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
pull_request:
branches:
- main
push:
branches: [ main ]

env:
NODE_VERSION: "16.x" # set this to the node version to use
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Sample HRIS application where a list of employees and their payroll information

### Client

![.github/workflows/npm.yml](https://github.com/KyleMcMaster/payroll-processor/workflows/.github/workflows/npm.yml/badge.svg)
![.github/workflows/policy-npm.yml](https://github.com/KyleMcMaster/payroll-processor/workflows/client%20-%20build%20&%20test/badge.svg)
[![Styled with Prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg)](https://prettier.io)

## Motivation
Expand Down
28 changes: 14 additions & 14 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

102 changes: 51 additions & 51 deletions vue-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 3f60e03

Please sign in to comment.