Skip to content

Commit 8a5a3fd

Browse files
committed
Fix merge conflicts
2 parents 5fdf5ac + 05ca98a commit 8a5a3fd

23 files changed

Lines changed: 146 additions & 121 deletions

.github/ISSUE_TEMPLATE/a11y-feature-request.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: ♿ A11y feature request
33
about: Suggest an idea for a new a11y feature
44
title: '[A11Y FEATURE]: <title>'
5-
labels: a11y-feature
5+
labels: 'a11y feature'
66

77
---
88

@@ -25,8 +25,8 @@ labels: a11y-feature
2525
<!--
2626
Provide a bullet-pointed list of acceptance criteria.
2727
-->
28-
-
29-
-
28+
- [ ]
29+
- [ ]
3030

3131

3232
## Why is this a11y feature important?

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Checka11y.css version:
3535
<!--
3636
Provide a bullet-pointed list of acceptance criteria.
3737
-->
38-
-
39-
-
38+
- [ ]
39+
- [ ]
4040

4141
## Why is fixing this bug important?
4242
<!--

.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ labels: documentation
2222
<!--
2323
Provide a bullet-pointed list of acceptance criteria.
2424
-->
25-
-
26-
-
25+
- [ ]
26+
- [ ]
2727

2828

2929
## Why is this important?

.github/ISSUE_TEMPLATE/project-enhancement-idea.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name: 💻 Project enhancement/maintenance idea
33
about: Suggest an idea for a project enhancement or maintenance
44
title: '[ENHANCEMENT]: <title>'
5-
labels: project-enhancement
5+
labels: 'project enhancement'
66

77
---
88

@@ -23,8 +23,8 @@ labels: project-enhancement
2323
<!--
2424
Provide a bullet-pointed list of acceptance criteria.
2525
-->
26-
-
27-
-
26+
- [ ]
27+
- [ ]
2828

2929

3030
## Why is this enhancement or maintenance important?

.github/PULL_REQUEST_TEMPLATE/a11y-feature.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: ♿ A11y feature
33
about: Submit a new a11y feature
4-
labels: a11y-feature
4+
labels: 'a11y feature'
55
title: '[A11Y FEATURE]: <title>'
66
---
77

@@ -16,7 +16,7 @@ title: '[A11Y FEATURE]: <title>'
1616
<!--
1717
Explain why this feature is important to have in Checka11y.css.
1818
Provide any relevant links to back up your reasoning.
19-
If this pull request resolves an `a11y-feature` issue, you can leave this section out and just put "This is described in the linked issue."
19+
If this pull request resolves an `a11y feature` issue, you can leave this section out and just put "This is described in the linked issue."
2020
-->
2121

2222
## Covered test cases
@@ -27,7 +27,7 @@ title: '[A11Y FEATURE]: <title>'
2727
### Did you test on all major browsers?
2828
<!--
2929
Put an `x` in all the boxes that apply.
30-
If not, please add a brief explanation as to why you couldn't (e.g. "I couldn't test Safari because I don't have access to an Apple device).
30+
If not, please add a brief explanation as to why you couldn't (e.g. "I couldn't test Safari because I don't have access to an Apple device").
3131
-->
3232
- [ ] Chrome
3333
- [ ] Firefox

.github/PULL_REQUEST_TEMPLATE/bug-fix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ title: '[BUG FIX]: <title>'
3333
### Did you test on all major browsers?
3434
<!--
3535
Put an `x` in all the boxes that apply.
36-
If not, please add a brief explanation as to why you couldn't (e.g. "I couldn't test Safari because I don't have access to an Apple device).
36+
If not, please add a brief explanation as to why you couldn't (e.g. "I couldn't test Safari because I don't have access to an Apple device").
3737
-->
3838
- [ ] Chrome
3939
- [ ] Firefox

.github/PULL_REQUEST_TEMPLATE/project-enhancement.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: 🚀 Project enhancement
33
about: Submit an enhancement or maintenance
4-
labels: project-enhancement
4+
labels: 'project enhancement'
55
title: '[ENHANCEMENT]: <title>'
66
---
77

@@ -16,7 +16,7 @@ title: '[ENHANCEMENT]: <title>'
1616
<!--
1717
Explain why this enhancement or maintenance is important to have in Checka11y.css.
1818
Provide any relevant links to back up your changes.
19-
If this pull request resolves a `project-enhancement` issue, you can leave this section out and just put "This is described in the linked issue."
19+
If this pull request resolves a `project enhancement` issue, you can leave this section out and just put "This is described in the linked issue."
2020
-->
2121

2222
## Covered test cases
@@ -27,7 +27,7 @@ title: '[ENHANCEMENT]: <title>'
2727
### Did you test on all major browsers?
2828
<!--
2929
Put an `x` in all the boxes that apply.
30-
If not, please add a brief explanation as to why you couldn't (e.g. "I couldn't test Safari because I don't have access to an Apple device).
30+
If not, please add a brief explanation as to why you couldn't (e.g. "I couldn't test Safari because I don't have access to an Apple device").
3131
-->
3232
- [ ] Chrome
3333
- [ ] Firefox

.github/workflows/Build.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.github/workflows/Tests.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/pipeline.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Pipeline
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
pull_request:
8+
branches:
9+
- master
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: Install Node
17+
uses: actions/setup-node@v2
18+
with:
19+
node-version: '14.x'
20+
- name: Clean install npm dependencies
21+
run: npm ci
22+
- name: Check project can build successfully
23+
run: npm run build
24+
- name: Check git is still clean after building
25+
run: npm run has-no-changes
26+
- name: Check project linting
27+
run: npm run lint:check
28+
tests:
29+
runs-on: ubuntu-latest
30+
steps:
31+
- uses: actions/checkout@v2
32+
- uses: cypress-io/github-action@v2
33+
with:
34+
browser: chrome
35+
headless: true
36+
spec: "cypress/integration/*"
37+
publish:
38+
needs: [build, tests]
39+
if: github.ref == 'refs/heads/master'
40+
runs-on: ubuntu-latest
41+
steps:
42+
- uses: actions/checkout@v2
43+
- name: Install Node
44+
uses: actions/setup-node@v2
45+
with:
46+
node-version: '14.x'
47+
- name: Clean install npm dependencies
48+
run: npm ci
49+
- name: Publish to npm
50+
uses: JS-DevTools/npm-publish@v1
51+
with:
52+
token: ${{ secrets.NPM_TOKEN }}
53+
check-version: true

0 commit comments

Comments
 (0)