Skip to content

Commit d64c703

Browse files
committed
Merge branch 'main' of github.com-lint:HeronLi2024/lint
# Conflicts: # package-lock.json
2 parents e2bc06d + 4a8db09 commit d64c703

File tree

8 files changed

+6962
-14065
lines changed

8 files changed

+6962
-14065
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,22 @@
11
name: Build
22

33
on:
4-
push:
5-
branches:
6-
- main
7-
- release/*
8-
- next
94
pull_request:
105
jobs:
116
build-and-test:
127
runs-on: ubuntu-latest
138
steps:
14-
- uses: actions/checkout@v5
9+
- uses: actions/checkout@v6
1510
with:
1611
fetch-depth: 0
1712
- name: Use Node.js 22.x
18-
uses: actions/setup-node@v5
13+
uses: actions/setup-node@v6
1914
with:
20-
node-version: 22.x
15+
node-version: 24.x
2116
cache: 'npm'
2217
- run: npm ci
2318
- run: npm run build
2419
- run: npm run format:check
2520
- run: npm run lint:commit
2621
- run: npm run lint
2722
- run: npm run plugin:test
28-
29-
release:
30-
if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/next' || startsWith(github.ref, 'refs/heads/release/')
31-
runs-on: ubuntu-latest
32-
permissions:
33-
contents: write # to be able to publish a GitHub release
34-
issues: write # to be able to comment on released issues
35-
pull-requests: write # to be able to comment on released pull requests
36-
id-token: write # to enable use of OIDC for npm provenance
37-
needs: build-and-test
38-
steps:
39-
- uses: actions/checkout@v5
40-
with:
41-
fetch-depth: 0
42-
- name: Use Node.js 22.x
43-
uses: actions/setup-node@v5
44-
with:
45-
node-version: 22.x
46-
cache: 'npm'
47-
- run: npm ci
48-
- run: npm run build
49-
- name: Semantic Release
50-
run: npx semantic-release
51-
env:
52-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- release/*
8+
- next
9+
10+
jobs:
11+
release:
12+
runs-on: ubuntu-latest
13+
permissions:
14+
id-token: write # to enable use of OIDC for npm provenance
15+
steps:
16+
- uses: actions/checkout@v6
17+
with:
18+
fetch-depth: 0 # semantic-release needs this
19+
token: ${{ secrets.ELEMENT_BOT_GITHUB_TOKEN }} # Otherwise, branch protection rules are not bypassed.
20+
- uses: actions/setup-node@v6
21+
with:
22+
node-version: 24.x
23+
cache: 'npm'
24+
- run: npm ci
25+
- run: npm run build
26+
- name: Semantic Release
27+
run: npx semantic-release
28+
env:
29+
GIT_AUTHOR_NAME: 'Siemens Element Bot'
30+
GIT_AUTHOR_EMAIL: 'simpl.si@siemens.com'
31+
GIT_COMMITTER_NAME: 'Siemens Element Bot'
32+
GIT_COMMITTER_EMAIL: 'simpl.si@siemens.com'
33+
GITHUB_TOKEN: ${{ secrets.ELEMENT_BOT_GITHUB_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const __filename = fileURLToPath(import.meta.url);
5959
const __dirname = path.dirname(__filename);
6060

6161
export default typescriptEslint.config({
62-
extends: [...baseTypescriptConfig, prettier],
62+
extends: [...typescriptConfig],
6363
files: ['**/*.ts'],
6464
languageOptions: {
6565
parserOptions: {

commitlint-config/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"license": "MIT",
2727
"type": "module",
2828
"peerDependencies": {
29-
"@commitlint/cli": "^19.0.0",
30-
"@commitlint/config-conventional": "^19.2.2"
29+
"@commitlint/cli": "^19.0.0 || ^20.0.0",
30+
"@commitlint/config-conventional": "^19.2.2 || ^20.0.0"
3131
}
3232
}

eslint-plugin-defaultvalue/tests/rule-tester.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const ruleTester = new RuleTester({
1212
projectService: {
1313
allowDefaultProject: ['*.ts*']
1414
},
15-
tsconfigRootDir: '.'
15+
tsconfigRootDir: '/'
1616
}
1717
}
1818
});

0 commit comments

Comments
 (0)