Skip to content

Commit ad55e8d

Browse files
committed
Merge branch 'main' of https://github.com/APIDevTools/swagger-parser into main
# Conflicts: # lib/index.js # package-lock.json # package.json
2 parents 4ed2d30 + 803ff45 commit ad55e8d

26 files changed

+39136
-33927
lines changed

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: philsturgeon

.github/workflows/CI-CD.yaml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,35 @@
66
name: CI-CD
77

88
on:
9-
push:
109
pull_request:
11-
schedule:
12-
- cron: "0 0 1 * *"
10+
push:
11+
branches: [main]
1312

1413
jobs:
1514
node_tests:
1615
name: Node ${{ matrix.node }} on ${{ matrix.os }}
1716
runs-on: ${{ matrix.os }}
1817
timeout-minutes: 10
1918
strategy:
20-
fail-fast: true
2119
matrix:
2220
os:
2321
- ubuntu-latest
2422
- macos-latest
2523
- windows-latest
2624
node:
27-
- 10
28-
- 12
2925
- 14
26+
- 16
27+
# - 18 TODO bring this back
3028

3129
steps:
3230
- name: Checkout source
33-
uses: actions/checkout@v2
31+
uses: actions/checkout@v3
3432

3533
- name: Install Node ${{ matrix.node }}
36-
uses: actions/setup-node@v1
34+
uses: actions/setup-node@v3
3735
with:
3836
node-version: ${{ matrix.node }}
37+
cache: 'npm'
3938

4039
- name: Install dependencies
4140
run: npm ci
@@ -63,26 +62,24 @@ jobs:
6362
fail-fast: true
6463
matrix:
6564
os:
66-
- ubuntu-latest # Chrome, Firefox, Safari (via SauceLabs), Edge (via SauceLabs)
67-
- windows-latest # Internet Explorer
65+
- ubuntu-latest # Chrome, Firefox, Safari (TODO)
66+
# - windows-latest # Internet Explorer, Edge
6867

6968
steps:
7069
- name: Checkout source
71-
uses: actions/checkout@v2
70+
uses: actions/checkout@v3
7271

7372
- name: Install Node
74-
uses: actions/setup-node@v1
73+
uses: actions/setup-node@v3
7574
with:
7675
node-version: 12
76+
cache: 'npm'
7777

7878
- name: Install dependencies
7979
run: npm ci
8080

8181
- name: Run tests
8282
run: npm run coverage:browser
83-
env:
84-
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
85-
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
8683

8784
- name: Combine code coverage data into a single file
8885
shell: bash
@@ -121,10 +118,13 @@ jobs:
121118

122119
steps:
123120
- name: Checkout source
124-
uses: actions/checkout@v2
121+
uses: actions/checkout@v3
125122

126123
- name: Install Node
127-
uses: actions/setup-node@v1
124+
uses: actions/setup-node@v3
125+
with:
126+
node-version: 12
127+
cache: 'npm'
128128

129129
- name: Install dependencies
130130
run: npm ci

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ To build/test the project locally on your computer:
126126
4. __Run the tests__<br>
127127
`npm test`
128128

129-
129+
5. __Check the code coverage__<br>
130+
`npm run coverage`
130131

131132
License
132133
--------------------------
@@ -143,5 +144,3 @@ Thanks to these awesome companies for their support of Open Source developers
143144
[![GitHub](https://apitools.dev/img/badges/github.svg)](https://github.com/open-source)
144145
[![NPM](https://apitools.dev/img/badges/npm.svg)](https://www.npmjs.com/)
145146
[![Coveralls](https://apitools.dev/img/badges/coveralls.svg)](https://coveralls.io)
146-
[![Travis CI](https://apitools.dev/img/badges/travis-ci.svg)](https://travis-ci.com)
147-
[![SauceLabs](https://apitools.dev/img/badges/sauce-labs.svg)](https://saucelabs.com)

karma.conf.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,13 @@ module.exports = karmaConfig({
1313
browsers: {
1414
chrome: host.ci ? host.os.linux : true,
1515
firefox: host.ci ? host.os.linux : true,
16-
safari: host.ci ? host.os.linux : host.os.mac, // SauceLabs in CI
17-
edge: host.ci ? host.os.linux : host.os.windows, // SauceLabs in CI
18-
ie: host.ci ? host.os.windows : true,
16+
safari: false,
17+
edge: false,
18+
ie: false,
19+
// Find a way to bring back these without using Saucelabs
20+
// safari: host.ci ? host.os.linux : host.os.mac,
21+
// edge: host.os.windows,
22+
// ie: host.ci ? host.os.windows : true,
1923
},
2024
config: {
2125
exclude: [

0 commit comments

Comments
 (0)