Skip to content

Commit 1c8b719

Browse files
author
John Doe
committed
fix: make all targets pass, title GH actions
1 parent 541ed9a commit 1c8b719

File tree

21 files changed

+60
-64
lines changed

21 files changed

+60
-64
lines changed

.github/workflows/code-pushup-fork-old.yml renamed to .github/workflows/code-pushup-fork.centralized.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Code PushUp (fork)
1+
name: Code PushUp - Centralized Style (fork)
22

33
# separated from code-pushup.yml for security reasons
44
# => requires permissions to create PR comment
@@ -20,7 +20,7 @@ permissions:
2020
jobs:
2121
code-pushup:
2222
runs-on: ubuntu-latest
23-
name: Code PushUp
23+
name: Code PushUp - Centralized Style
2424
if: github.event.pull_request.head.repo.fork
2525
steps:
2626
- name: Checkout repository
@@ -35,4 +35,4 @@ jobs:
3535
- name: Run Code PushUp action
3636
uses: code-pushup/github-action@v0
3737
with:
38-
bin: npx nx code-pushup-old --
38+
bin: npx nx code-pushup-central --

.github/workflows/code-pushup-fork.yml renamed to .github/workflows/code-pushup-fork.monorepo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Code PushUp (fork)
1+
name: Code PushUp - Monorepo Style (fork)
22

33
# separated from code-pushup.yml for security reasons
44
# => requires permissions to create PR comment
@@ -20,7 +20,7 @@ permissions:
2020
jobs:
2121
code-pushup:
2222
runs-on: ubuntu-latest
23-
name: Code PushUp
23+
name: Code PushUp - Monorepo Style
2424
if: github.event.pull_request.head.repo.fork
2525
steps:
2626
- name: Checkout PR head

.github/workflows/code-pushup-old.yml renamed to .github/workflows/code-pushup.centralized.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Code PushUp
1+
name: Code PushUp - Centralized Style
22

33
on:
44
push:
@@ -15,7 +15,7 @@ permissions:
1515
jobs:
1616
code-pushup:
1717
runs-on: ubuntu-latest
18-
name: Code PushUp
18+
name: Code PushUp - Centralized Style
1919
# ignore PRs from forks, handled by code-pushup-fork.yml
2020
if: ${{ !github.event.pull_request.head.repo.fork }}
2121
env:
@@ -36,4 +36,4 @@ jobs:
3636
- name: Run Code PushUp action
3737
uses: code-pushup/github-action@v0
3838
with:
39-
bin: npx nx code-pushup-old --
39+
bin: npx nx code-pushup-central --

.github/workflows/code-pushup.yml renamed to .github/workflows/code-pushup.monorepo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Code PushUp
1+
name: Code PushUp - Monorepo Style
22

33
on:
44
push:
@@ -15,7 +15,7 @@ permissions:
1515
jobs:
1616
code-pushup:
1717
runs-on: ubuntu-latest
18-
name: Code PushUp
18+
name: Code PushUp - Monorepo Style
1919
# ignore PRs from forks, handled by code-pushup-fork.yml
2020
if: ${{ !github.event.pull_request.head.repo.fork }}
2121
env:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const merged = mergeConfigs(
2626
await typescriptPluginConfig({
2727
tsconfig: 'packages/cli/tsconfig.lib.json',
2828
}),
29+
2930
await eslintCoreConfigNx(),
3031
jsDocsCoreConfig([
3132
'packages/**/src/**/*.ts',

code-pushup.config.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import 'dotenv/config';
22
import {
3-
coverageCoreConfigNx,
4-
eslintCoreConfigNx,
5-
jsDocsCoreConfig,
6-
jsDocsExclusionPatterns,
73
jsPackagesCoreConfig,
84
lighthouseCoreConfig,
95
loadEnv,
106
mergeConfigs,
11-
typescriptPluginConfig,
127
} from './code-pushup.preset.js';
138
import type { CoreConfig } from './packages/models/src/index.js';
149

@@ -22,16 +17,7 @@ const config: CoreConfig = {
2217
export default mergeConfigs(
2318
config,
2419
await jsPackagesCoreConfig(),
25-
await coverageCoreConfigNx(projectName),
2620
await lighthouseCoreConfig(
2721
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
2822
),
29-
await eslintCoreConfigNx(projectName),
30-
jsDocsCoreConfig([
31-
`packages/${projectName}/src/**/*.ts`,
32-
...jsDocsExclusionPatterns,
33-
]),
34-
await typescriptPluginConfig({
35-
tsconfig: `packages/${projectName}/tsconfig.lib.json`,
36-
}),
3723
);

code-pushup.preset.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,7 @@ export const eslintCoreConfigNx = async (
217217
): Promise<CoreConfig> => ({
218218
plugins: [
219219
projectName
220-
? await eslintPlugin({
221-
eslintrc: `packages/${projectName}/eslint.config.js`,
222-
patterns: ['.'],
223-
})
220+
? await eslintPlugin(`packages/${projectName}/eslint.config.js`)
224221
: await eslintPlugin(await eslintConfigFromAllNxProjects()),
225222
],
226223
categories: eslintCategories,

packages/ci/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
"dependsOn": [
1313
"code-pushup-coverage",
1414
"code-pushup-jsdocs",
15-
"code-pushup-typescript"
15+
"code-pushup-typescript",
16+
"code-pushup-eslint"
1617
]
1718
},
19+
"code-pushup-eslint": {},
1820
"code-pushup-coverage": {},
1921
"code-pushup-jsdocs": {},
2022
"code-pushup-typescript": {}

packages/cli/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@
3030
"dependsOn": [
3131
"code-pushup-coverage",
3232
"code-pushup-jsdocs",
33-
"code-pushup-typescript"
33+
"code-pushup-typescript",
34+
"code-pushup-eslint"
3435
]
3536
},
37+
"code-pushup-eslint": {},
3638
"code-pushup-coverage": {},
3739
"code-pushup-jsdocs": {},
3840
"code-pushup-typescript": {}

packages/core/project.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
"dependsOn": [
1313
"code-pushup-coverage",
1414
"code-pushup-jsdocs",
15-
"code-pushup-typescript"
15+
"code-pushup-typescript",
16+
"code-pushup-eslint"
1617
]
1718
},
19+
"code-pushup-eslint": {},
1820
"code-pushup-coverage": {},
1921
"code-pushup-jsdocs": {},
2022
"code-pushup-typescript": {}

0 commit comments

Comments
 (0)