Skip to content

Commit cb7c183

Browse files
authored
Merge branch 'master' into WikiRik/split-test-files
2 parents ccce66a + 991e5ac commit cb7c183

File tree

5 files changed

+22
-24
lines changed

5 files changed

+22
-24
lines changed

Diff for: .github/workflows/ci.yml

+8-9
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,24 @@ on:
66
branches: [master]
77
jobs:
88
test:
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010
strategy:
1111
matrix:
12-
node-version: [20, 18, 16, 14, 12, 10, 8, 6]
12+
node-version: [22, 20, 18, 16, 14, 12, 10, 8, 6]
1313
name: Run tests on Node.js ${{ matrix.node-version }}
1414
steps:
1515
- name: Setup Node.js ${{ matrix.node-version }}
16-
uses: actions/setup-node@v2-beta
16+
uses: actions/setup-node@v4
1717
with:
1818
node-version: ${{ matrix.node-version }}
19-
check-latest: true
2019
- name: Checkout repository
21-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2221
- name: Install dependencies
23-
run: npm install --legacy-peer-deps
22+
run: npm install --legacy-peer-deps
2423
- name: Run tests
2524
run: npm test
26-
- if: matrix.node-version == 20
25+
- if: matrix.node-version == 22
2726
name: Send coverage info to Codecov
28-
uses: codecov/codecov-action@v1
27+
uses: codecov/codecov-action@v5
2928
with:
30-
file: ./coverage/cobertura-coverage.xml
29+
token: ${{ secrets.CODECOV_TOKEN }}

Diff for: .github/workflows/codeql-analysis.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ jobs:
3838

3939
steps:
4040
- name: Checkout repository
41-
uses: actions/checkout@v2
41+
uses: actions/checkout@v4
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v2
45+
uses: github/codeql-action/init@v3
4646
with:
4747
languages: ${{ matrix.language }}
4848
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
5353
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
5454
# If this step fails, then you should remove it and run the build manually (see below)
5555
- name: Autobuild
56-
uses: github/codeql-action/autobuild@v2
56+
uses: github/codeql-action/autobuild@v3
5757

5858
# ℹ️ Command-line programs to run using the OS shell.
5959
# 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
6767
# make release
6868

6969
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
70+
uses: github/codeql-action/analyze@v3

Diff for: .github/workflows/npm-publish.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,20 @@ on:
44
types: [created]
55
jobs:
66
publish:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-latest
88
permissions:
99
contents: read
1010
id-token: write
1111
steps:
12-
- name: Setup Node.js 18
13-
uses: actions/setup-node@v3
12+
- name: Setup Node.js 22
13+
uses: actions/setup-node@v4
1414
with:
15-
node-version: 18
16-
check-latest: true
15+
node-version: 22
1716
registry-url: https://registry.npmjs.org/
1817
- name: Checkout Repository
19-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
2019
- name: Install Dependencies
21-
run: npm install
20+
run: npm install --legacy-peer-deps
2221
- name: Run Tests
2322
run: npm test
2423
- name: Publish Package to NPM Registry

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"es",
1010
"lib",
1111
"README.md",
12-
"LICENCE",
12+
"LICENSE",
1313
"validator.js",
1414
"validator.min.js"
1515
],

Diff for: test/validators.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3733,6 +3733,7 @@ describe('Validators', () => {
37333733
'rgba(0,0,0,0)',
37343734
'rgba(255,255,255,1)',
37353735
'rgba(255,255,255,.1)',
3736+
'rgba(255,255,255,.12)',
37363737
'rgba(255,255,255,0.1)',
37373738
'rgb(5%,5%,5%)',
37383739
'rgba(5%,5%,5%,.3)',
@@ -3744,7 +3745,6 @@ describe('Validators', () => {
37443745
'rgb()',
37453746
'rgba(0,0,0)',
37463747
'rgba(255,255,255,2)',
3747-
'rgba(255,255,255,.12)',
37483748
'rgba(255,255,256,0.1)',
37493749
'rgb(4,4,5%)',
37503750
'rgba(5%,5%,5%)',
@@ -3805,6 +3805,7 @@ describe('Validators', () => {
38053805
'rgba(0,0,0,0)',
38063806
'rgba(255,255,255,1)',
38073807
'rgba(255,255,255,.1)',
3808+
'rgba(255,255,255,.12)',
38083809
'rgba(255,255,255,0.1)',
38093810
'rgb(5%,5%,5%)',
38103811
'rgba(5%,5%,5%,.3)',
@@ -3824,7 +3825,6 @@ describe('Validators', () => {
38243825
'rgb()',
38253826
'rgba(0,0,0)',
38263827
'rgba(255,255,255,2)',
3827-
'rgba(255,255,255,.12)',
38283828
'rgba(255,255,256,0.1)',
38293829
'rgb(4,4,5%)',
38303830
'rgba(5%,5%,5%)',
@@ -3897,6 +3897,7 @@ describe('Validators', () => {
38973897
'rgba(0,0,0,0)',
38983898
'rgba(255,255,255,1)',
38993899
'rgba(255,255,255,.1)',
3900+
'rgba(255,255,255,.12)',
39003901
'rgba(255,255,255,0.1)',
39013902
'rgb(5%,5%,5%)',
39023903
'rgba(5%,5%,5%,.3)',
@@ -3917,7 +3918,6 @@ describe('Validators', () => {
39173918
'rgb()',
39183919
'rgba(0,0,0)',
39193920
'rgba(255,255,255,2)',
3920-
'rgba(255,255,255,.12)',
39213921
'rgba(255,255,256,0.1)',
39223922
'rgb(4,4,5%)',
39233923
'rgba(5%,5%,5%)',

0 commit comments

Comments
 (0)