Skip to content

Commit bb5f001

Browse files
xt0rtedxt0rted
committed
Merge branch 'main' into releases/v1
2 parents 1eea26b + c7f9f54 commit bb5f001

File tree

14 files changed

+6050
-3568
lines changed

14 files changed

+6050
-3568
lines changed

‎.github/dependabot.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: 2
2+
updates:
3+
4+
- package-ecosystem: github-actions
5+
directory: "/"
6+
schedule:
7+
interval: weekly
8+
open-pull-requests-limit: 99
9+
10+
- package-ecosystem: npm
11+
directory: "/"
12+
schedule:
13+
interval: weekly
14+
open-pull-requests-limit: 99
15+
versioning-strategy: increase

‎.github/workflows/ci.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,30 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
7+
- main
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
env:
14+
FORCE_COLOR: 3
815

916
jobs:
1017
build:
1118
runs-on: ubuntu-latest
1219

1320
strategy:
21+
fail-fast: false
1422
matrix:
15-
node: [12, 13]
23+
node: [12, 14, 16]
1624

1725
steps:
1826
- name: Checkout Repo
19-
uses: actions/checkout@v2.0.0
27+
uses: actions/checkout@v3.0.2
2028

2129
- name: Install Node
22-
uses: actions/setup-node@v1.3.0
30+
uses: actions/setup-node@v3.1.1
2331
with:
2432
node-version: ${{ matrix.node }}
2533

@@ -30,3 +38,5 @@ jobs:
3038
- run: npm test
3139

3240
- run: npm run build
41+
42+
- run: npm run package

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: "CodeQL"
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
schedule:
9+
- cron: '23 21 * * 5'
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
env:
16+
FORCE_COLOR: 3
17+
18+
jobs:
19+
analyze:
20+
name: Analyze
21+
22+
runs-on: ubuntu-latest
23+
24+
permissions:
25+
actions: read
26+
contents: read
27+
security-events: write
28+
29+
strategy:
30+
fail-fast: false
31+
matrix:
32+
language: [ 'javascript' ]
33+
34+
steps:
35+
- name: Checkout repository
36+
uses: actions/checkout@v3.0.2
37+
38+
- name: Initialize CodeQL
39+
uses: github/codeql-action/init@v2
40+
with:
41+
languages: ${{ matrix.language }}
42+
43+
- name: Autobuild
44+
uses: github/codeql-action/autobuild@v2
45+
46+
- name: Perform CodeQL Analysis
47+
uses: github/codeql-action/analyze@v2

‎.github/workflows/dependabot-auto-merge.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Dependabot auto-merge
2+
3+
on: pull_request_target
4+
5+
permissions:
6+
contents: read
7+
pull-requests: read
8+
9+
jobs:
10+
dependabot:
11+
uses: xt0rted/.github/.github/workflows/dependabot-auto-merge.yml@main
12+
secrets:
13+
GITHUB_APP_ID: ${{ secrets.DEPENDAMERGE_APP_ID }}
14+
GITHUB_APP_PRIVATE_KEY: ${{ secrets.DEPENDAMERGE_PRIVATE_KEY }}

‎.github/workflows/fixup-commits.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Block on fixup commits
2+
3+
on: pull_request_target
4+
5+
permissions:
6+
pull-requests: read
7+
8+
jobs:
9+
message:
10+
uses: xt0rted/.github/.github/workflows/fixup-commits.yml@main

‎.github/workflows/pull_request.yml‎

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

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Changelog
2+
3+
## Unreleased
4+
5+
## [1.3.0](https://github.com/xt0rted/stylelint-problem-matcher/compare/v1.2.0...v1.3.0) - 2022-04-28
6+
7+
- Bumped `@actions/core` from 1.2.2 to 1.7.0
8+
9+
## [1.2.0](https://github.com/xt0rted/stylelint-problem-matcher/compare/v1.1.0...v1.2.0) - 2020-02-18
10+
11+
- Pulling owner name from problem matcher file when removing it
12+
13+
## [1.1.0](https://github.com/xt0rted/stylelint-problem-matcher/compare/v1.0.0...v1.1.0) - 2020-02-04
14+
15+
- Updated problem matcher regex to handle rules without line numbers such as [`unicode-bom`](https://stylelint.io/user-guide/rules/unicode-bom) ([#2](https://github.com/xt0rted/stylelint-problem-matcher/pull/2))
16+
17+
## [1.0.0](https://github.com/xt0rted/stylelint-problem-matcher/releases/tag/v1.0.0) - 2020-02-03
18+
19+
- Initial release

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Problem Matcher for stylelint
22

3-
[![CI Workflow Status](https://github.com/xt0rted/stylelint-problem-matcher/workflows/CI/badge.svg)](https://github.com/xt0rted/stylelint-problem-matcher/actions?query=workflow%3ACI)
4-
[![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=xt0rted/stylelint-problem-matcher)](https://dependabot.com)
3+
[![CI](https://github.com/xt0rted/stylelint-problem-matcher/actions/workflows/ci.yml/badge.svg?branch=main)](https://github.com/xt0rted/stylelint-problem-matcher/actions/workflows/ci.yml)
4+
[![CodeQL](https://github.com/xt0rted/stylelint-problem-matcher/actions/workflows/codeql-analysis.yml/badge.svg?branch=main)](https://github.com/xt0rted/stylelint-problem-matcher/actions/workflows/codeql-analysis.yml)
55

66
Adds a problem matcher that will detect errors from [Stylelint](https://stylelint.io/) and create annotations for them.
77

‎__tests__/problemMatcher.test.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { matchResults } from "../__helpers__/utils";
22
import { problemMatcher as problemMatcherJson } from "../.github/problem-matcher.json";
3-
import { ProblemMatcher, ProblemPattern } from "github-actions-problem-matcher-typings";
3+
4+
import type { ProblemMatcher, ProblemPattern } from "github-actions-problem-matcher-typings";
45

56
const problemMatcher: ProblemMatcher = problemMatcherJson[0];
67

‎jest.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module.exports = {
1414
}
1515
},
1616
moduleFileExtensions: ["js", "ts"],
17+
reporters: ["default", "github-actions"],
1718
testEnvironment: "node",
1819
testMatch: ["**/*.test.ts"],
1920
testRunner: "jest-circus/runner",

0 commit comments

Comments
 (0)