Skip to content

Commit 5c4c5c1

Browse files
committed
chore: Merge branch 'main' into update-dependencies
2 parents e436a9d + b1a5597 commit 5c4c5c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+9435
-3520
lines changed

.github/workflows/publish.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,21 @@ on:
99
- main
1010

1111
jobs:
12-
build:
12+
publish:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
1616
uses: actions/checkout@v2
17+
1718
- name: Install Dependencies
1819
run: npm ci
20+
1921
- name: Check Code Style
2022
run: npm run lint
23+
2124
- name: Build Project
2225
run: npm run build
26+
2327
- name: Semantic Release
2428
uses: cycjimmy/semantic-release-action@v2
2529
env:
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3+
4+
name: SASjs Utils Run Tests on Windows
5+
6+
on:
7+
pull_request:
8+
9+
jobs:
10+
test:
11+
runs-on: windows-latest
12+
13+
strategy:
14+
matrix:
15+
node-version: [lts/fermium]
16+
17+
steps:
18+
- uses: actions/checkout@v2
19+
- name: Use Node.js ${{ matrix.node-version }}
20+
uses: actions/setup-node@v2
21+
with:
22+
node-version: ${{ matrix.node-version }}
23+
24+
- name: Install Dependencies
25+
run: npm ci
26+
27+
- name: Check Code Style
28+
run: npm run lint
29+
30+
- name: Run Unit Tests
31+
run: npm test
32+
33+
- name: Build Package
34+
run: npm run package:lib
35+
env:
36+
CI: true

.github/workflows/build.yml renamed to .github/workflows/run-tests.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,35 @@
11
# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
22
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
33

4-
name: SASjs Utils Build
4+
name: SASjs Utils Run Tests
55

66
on:
7-
push:
87
pull_request:
98

109
jobs:
11-
build:
10+
test:
1211
runs-on: ubuntu-latest
1312

1413
strategy:
1514
matrix:
16-
node-version: [15.x]
15+
node-version: [lts/fermium]
1716

1817
steps:
1918
- uses: actions/checkout@v2
2019
- name: Use Node.js ${{ matrix.node-version }}
21-
uses: actions/setup-node@v1
20+
uses: actions/setup-node@v2
2221
with:
2322
node-version: ${{ matrix.node-version }}
23+
2424
- name: Install Dependencies
2525
run: npm ci
26+
2627
- name: Check Code Style
2728
run: npm run lint
29+
2830
- name: Run Unit Tests
2931
run: npm test
32+
3033
- name: Build Package
3134
run: npm run package:lib
3235
env:

.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"trailingComma": "none",
33
"tabWidth": 2,
44
"semi": false,
5-
"singleQuote": true
5+
"singleQuote": true,
6+
"endOfLine": "auto"
67
}

jest.config.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
module.exports = {
2-
preset: 'ts-jest',
2+
preset: 'ts-jest/presets/js-with-ts',
3+
resetMocks: true,
4+
restoreMocks: true,
5+
setupFilesAfterEnv: ['jest-extended/all'],
36
testEnvironment: 'node',
7+
transform: {
8+
'^.+\\.ts?$': 'ts-jest'
9+
},
410
coverageThreshold: {
511
global: {
612
branches: 80,

0 commit comments

Comments
 (0)