Skip to content

Commit 35dce8a

Browse files
committed
Merge branch 'main' into npm-update
2 parents 7e570cd + bb4653d commit 35dce8a

6 files changed

Lines changed: 51 additions & 15 deletions

File tree

.github/matchers/actionlint.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"problemMatcher": [
3+
{
4+
"owner": "actionlint",
5+
"pattern": [
6+
{
7+
"regexp": "^(?:\\x1b\\[\\d+m)?(.+?)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*:(?:\\x1b\\[\\d+m)*(\\d+)(?:\\x1b\\[\\d+m)*: (?:\\x1b\\[\\d+m)*(.+?)(?:\\x1b\\[\\d+m)* \\[(.+?)\\]$",
8+
"file": 1,
9+
"line": 2,
10+
"column": 3,
11+
"message": 4,
12+
"code": 5
13+
}
14+
]
15+
}
16+
]
17+
}

.github/workflows/ci.yml

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ jobs:
1010
runs-on: ${{ matrix.os }}
1111
strategy:
1212
matrix:
13-
include:
14-
- os: ubuntu-latest
15-
target-folder: drop-linux
16-
- os: windows-latest
17-
target-folder: drop
13+
os: [ubuntu-latest, windows-latest]
1814

1915
steps:
2016
- uses: actions/checkout@v6
@@ -30,11 +26,33 @@ jobs:
3026
- name: npm ci
3127
run: npm ci
3228

29+
- name: test
30+
run: npm test
31+
3332
- name: lint
3433
run: npm run lint
3534

3635
- name: prettier
3736
run: npm run prettier
3837

39-
- name: test
40-
run: npm test
38+
- if: runner.os == 'Linux'
39+
name: Pack
40+
run: npm pack
41+
42+
- if: runner.os == 'Linux'
43+
name: Upload tarball
44+
uses: actions/upload-artifact@v7
45+
with:
46+
path: "azure-oad-*.tgz"
47+
archive: false
48+
49+
# Content copied from https://raw.githubusercontent.com/rhysd/actionlint/2ab3a12c7848f6c15faca9a92612ef4261d0e370/.github/actionlint-matcher.json
50+
- if: runner.os == 'Linux'
51+
name: Add ActionLint Problem Matcher
52+
run: echo "::add-matcher::.github/matchers/actionlint.json"
53+
54+
- if: runner.os == 'Linux'
55+
name: Lint workflows
56+
uses: docker://rhysd/actionlint:1.7.11
57+
with:
58+
args: -color -verbose

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
*.jsonc
44
.prettierrc
55
azure-pipelines.yml
6+
coverage/

eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = tseslint.config(
2727
},
2828
{
2929
// Based on https://eslint.org/docs/latest/use/configure/configuration-files#globally-ignoring-files-with-ignores
30-
ignores: ["**/dist", "eslint.config.js"]
30+
ignores: ["**/dist", "eslint.config.js", "coverage/**"]
3131
},
3232
{
3333
rules: {

package-lock.json

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"eslint": "^10.0.0",
3636
"globals": "^17.3.0",
3737
"jest": "^30.1.3",
38-
"prettier": "3.8.1",
38+
"prettier": "3.8.3",
3939
"ts-jest": "^29.1.4",
4040
"typescript": "~5.9.2",
41-
"typescript-eslint": "^8.56.0"
41+
"typescript-eslint": "^8.58.0"
4242
},
4343
"homepage": "https://github.com/Azure/openapi-diff",
4444
"repository": {

0 commit comments

Comments
 (0)