Skip to content

Commit 2b1352e

Browse files
Merge branch 'main' into readme-update-config
2 parents b05e1cc + 51938d7 commit 2b1352e

File tree

13 files changed

+4862
-333
lines changed

13 files changed

+4862
-333
lines changed

.editorconfig

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
# http://editorconfig.org
2-
31
root = true
42

53
[*]
4+
charset = utf-8
65
end_of_line = lf
7-
indent_style = tab
86
indent_size = 4
7+
indent_style = tab
98
insert_final_newline = true
109
trim_trailing_whitespace = true
1110

12-
[package.json]
13-
indent_style = spaces
14-
indent_size = 2
15-
1611
[*.md]
17-
indent_style = spaces
12+
indent_style = space
1813
trim_trailing_whitespace = false
14+
15+
[*.yml]
16+
indent_style = space
17+
indent_size = 2
18+
19+
[package.json]
20+
indent_style = space
21+
indent_size = 2

.github/workflows/publish.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
on:
2+
release:
3+
types: [created, edited, published]
4+
workflow_dispatch:
5+
inputs:
6+
dryRun:
7+
description: Dry run only
8+
required: true
9+
default: true
10+
type: boolean
11+
12+
jobs:
13+
build:
14+
runs-on: ubuntu-20.04
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v3
18+
with:
19+
node-version: 16
20+
registry-url: https://registry.npmjs.org
21+
- run: npm ci
22+
23+
- name: Publish package
24+
env:
25+
NODE_AUTH_TOKEN: ${{ secrets.REGISTRY_PUBLISH_TOKEN }}
26+
if: >
27+
(github.event_name == 'release' && github.event.action == 'published') ||
28+
(github.event_name == 'workflow_dispatch' && !inputs.dryRun)
29+
run: npm publish
30+
31+
- name: Publish package (dry run)
32+
env:
33+
NODE_AUTH_TOKEN: ${{ secrets.REGISTRY_PUBLISH_TOKEN }}
34+
if: >
35+
(github.event_name == 'release' && github.event.action != 'published') ||
36+
(github.event_name == 'workflow_dispatch' && inputs.dryRun)
37+
run: npm publish --dry-run

.github/workflows/tests.yml

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,37 @@
1-
# This workflow will do a clean install of node dependencies, build the source code and run tests.
2-
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
3-
4-
name: Build and lint
5-
61
on:
72
push:
8-
branches: # Run actions when code is committed to these branches
9-
- master
3+
branches:
4+
- main
105
pull_request:
11-
branches: # Run actions when a PR is pushed based on one of these branches
12-
- master
136

147
jobs:
15-
checkout_and_test:
8+
lint:
169
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v3
13+
with:
14+
node-version: 12
15+
- run: npm ci
16+
- run: npm run lint
17+
18+
test:
19+
name: test on ${{ matrix.os }} with node ${{ matrix.node-version }}
20+
runs-on: ${{ matrix.os }}
1721
strategy:
22+
fail-fast: false
1823
matrix:
19-
include:
20-
- node-version: 12.x
21-
lint: true # Linter is run only once to shorten the total build time
22-
- node-version: 14.x
23-
- node-version: 16.x
24-
24+
os: [ubuntu-20.04, windows-latest, macos-latest]
25+
node-version: [12, 14, 16, 18, 20]
2526
steps:
26-
- name: Checkout code from ${{ github.repository }}
27-
uses: actions/checkout@v2
28-
- name: Setup node
29-
uses: actions/setup-node@v2
27+
- name: Normalise line-ending handling in Git
28+
shell: bash
29+
run: |
30+
git config --global core.autocrlf false
31+
if: runner.os == 'Windows'
32+
- uses: actions/checkout@v4
33+
- uses: actions/setup-node@v3
3034
with:
3135
node-version: ${{ matrix.node-version }}
32-
- name: Install dependencies
33-
run: npm ci
34-
- name: Run linter
35-
if: ${{ matrix.lint }}
36-
run: npm run lint
37-
- name: Run tests
38-
run: npm test
36+
- run: npm ci
37+
- run: npm test

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lockfile-version=2

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
14

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Changelog
22

3-
# 3.0.1 (2021-12-20)
3+
## 3.1.0 (2023-11-14)
4+
5+
* Placeholder
6+
7+
## 3.0.1 (2021-12-20)
48

59
* missing await for async function (thanks @aarongoldenthal)
610

CONTRIBUTING.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# Contributing Guide
32

43
Thanks for getting involved :tada:
@@ -7,11 +6,9 @@ The Pa11y team loves to see new contributors, and we strive to provide a welcomi
76

87
Our website outlines the many ways that you can contribute to Pa11y:
98

10-
- [Help us to talk to our users][communications]
11-
- [Help us out with design][designers]
12-
- [Help us with our code][developers]
13-
14-
9+
- [Help us to talk to our users][communications]
10+
- [Help us out with design][designers]
11+
- [Help us with our code][developers]
1512

1613
[code-of-conduct]: https://pa11y.org/contributing/code-of-conduct/
1714
[communications]: https://pa11y.org/contributing/communications/

0 commit comments

Comments
 (0)