Skip to content

Commit b6e9182

Browse files
authored
Merge branch 'main' into update-validation-for-object
2 parents d8fa482 + 31b17f4 commit b6e9182

File tree

12 files changed

+49752
-30964
lines changed

12 files changed

+49752
-30964
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: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,34 @@
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
3027

3128
steps:
3229
- name: Checkout source
33-
uses: actions/checkout@v2
30+
uses: actions/checkout@v3
3431

3532
- name: Install Node ${{ matrix.node }}
36-
uses: actions/setup-node@v1
33+
uses: actions/setup-node@v3
3734
with:
3835
node-version: ${{ matrix.node }}
36+
cache: 'npm'
3937

4038
- name: Install dependencies
4139
run: npm ci
@@ -63,26 +61,24 @@ jobs:
6361
fail-fast: true
6462
matrix:
6563
os:
66-
- ubuntu-latest # Chrome, Firefox, Safari (via SauceLabs), Edge (via SauceLabs)
67-
- windows-latest # Internet Explorer
64+
- ubuntu-latest # Chrome, Firefox, Safari (TODO)
65+
# - windows-latest # Internet Explorer, Edge
6866

6967
steps:
7068
- name: Checkout source
71-
uses: actions/checkout@v2
69+
uses: actions/checkout@v3
7270

7371
- name: Install Node
74-
uses: actions/setup-node@v1
72+
uses: actions/setup-node@v3
7573
with:
7674
node-version: 12
75+
cache: 'npm'
7776

7877
- name: Install dependencies
7978
run: npm ci
8079

8180
- name: Run tests
8281
run: npm run coverage:browser
83-
env:
84-
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
85-
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
8682

8783
- name: Combine code coverage data into a single file
8884
shell: bash
@@ -121,10 +117,13 @@ jobs:
121117

122118
steps:
123119
- name: Checkout source
124-
uses: actions/checkout@v2
120+
uses: actions/checkout@v3
125121

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

129128
- name: Install dependencies
130129
run: npm ci

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,3 @@ Thanks to these awesome companies for their support of Open Source developers
144144
[![GitHub](https://apitools.dev/img/badges/github.svg)](https://github.com/open-source)
145145
[![NPM](https://apitools.dev/img/badges/npm.svg)](https://www.npmjs.com/)
146146
[![Coveralls](https://apitools.dev/img/badges/coveralls.svg)](https://coveralls.io)
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: [

lib/validators/schema.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function validateSchema (api) {
6464
*/
6565
function initializeAjv (draft04 = true) {
6666
const opts = {
67-
allErrors: false,
67+
allErrors: true,
6868
strict: false,
6969
validateFormats: false,
7070
};

0 commit comments

Comments
 (0)