Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/actions/code-pushup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ inputs:
description: GitHub token for API access
required: true
default: ${{ github.token }}
mode:
description: Is `standalone` or `monorepo` mode?
required: true

runs:
using: composite
Expand All @@ -16,3 +19,4 @@ runs:
env:
TSX_TSCONFIG_PATH: .github/actions/code-pushup/tsconfig.json
GH_TOKEN: ${{ inputs.token }}
MODE: ${{ inputs.mode }}
32 changes: 28 additions & 4 deletions .github/actions/code-pushup/src/runner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
type SourceFileIssue,
runInCI,
} from '@code-pushup/ci';
import { DEFAULT_PERSIST_CONFIG } from '@code-pushup/models';
import {
CODE_PUSHUP_UNICODE_LOGO,
logger,
Expand Down Expand Up @@ -86,7 +87,7 @@ function createAnnotationsFromIssues(issues: SourceFileIssue[]): void {
}

function createGitHubApiClient(): ProviderAPIClient {
const token = process.env.GH_TOKEN;
const token = process.env['GH_TOKEN'];

if (!token) {
throw new Error('No GitHub token found');
Expand Down Expand Up @@ -134,9 +135,32 @@ async function run(): Promise<void> {
logger.setVerbose(true);
}

const options: Options = {
bin: 'npx nx code-pushup --nx-bail --',
};
const isMonorepo = process.env['MODE'] === 'monorepo';

const options: Options = isMonorepo
? {
jobId: 'monorepo-mode',
monorepo: 'nx',
nxProjectsFilter: '--with-target=code-pushup --exclude=workspace',
configPatterns: {
persist: {
...DEFAULT_PERSIST_CONFIG,
outputDir: '.code-pushup/{projectName}',
},
...(process.env['CP_API_KEY'] && {
upload: {
server: 'https://api.staging.code-pushup.dev/graphql',
apiKey: process.env['CP_API_KEY'],
organization: 'code-pushup',
project: 'cli-{projectName}',
},
}),
},
}
: {
jobId: 'standalone-mode',
bin: 'npx nx code-pushup --',
};

const gitRefs = parseGitRefs();

Expand Down
31 changes: 28 additions & 3 deletions .github/workflows/code-pushup-fork.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Code PushUp - Standalone Mode (fork)
name: Code PushUp (fork)

# separated from code-pushup.yml for security reasons
# => requires permissions to create PR comment
Expand All @@ -18,9 +18,9 @@ permissions:
pull-requests: write

jobs:
code-pushup:
standalone:
runs-on: ubuntu-latest
name: Run Code PushUp (fork)
name: Standalone mode (fork)
if: github.event.pull_request.head.repo.fork
steps:
- name: Checkout repository
Expand All @@ -40,3 +40,28 @@ jobs:
uses: ./.github/actions/code-pushup
with:
token: ${{ secrets.GITHUB_TOKEN }}
mode: standalone

monorepo:
runs-on: ubuntu-latest
name: Monorepo mode (fork)
if: github.event.pull_request.head.repo.fork
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- name: Set base and head for Nx affected commands
uses: nrwl/nx-set-shas@v4
- name: Install dependencies
run: npm ci
- name: Run Code PushUp action
uses: ./.github/actions/code-pushup
with:
token: ${{ secrets.GITHUB_TOKEN }}
mode: monorepo
34 changes: 31 additions & 3 deletions .github/workflows/code-pushup.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Code PushUp - Standalone Mode
name: Code PushUp

on:
push:
Expand All @@ -14,9 +14,9 @@ permissions:
pull-requests: write

jobs:
code-pushup:
standalone:
runs-on: ubuntu-latest
name: Run Code PushUp
name: Standalone mode
# ignore PRs from forks, handled by code-pushup-fork.yml
if: ${{ !github.event.pull_request.head.repo.fork }}
env:
Expand All @@ -39,3 +39,31 @@ jobs:
uses: ./.github/actions/code-pushup
with:
token: ${{ secrets.GITHUB_TOKEN }}
mode: standalone

monorepo:
runs-on: ubuntu-latest
name: Monorepo mode
# ignore PRs from forks, handled by code-pushup-fork.yml
if: ${{ !github.event.pull_request.head.repo.fork }}
env:
CP_API_KEY: ${{ secrets.CP_API_KEY }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version-file: .node-version
cache: npm
- name: Set base and head for Nx affected commands
uses: nrwl/nx-set-shas@v4
- name: Install dependencies
run: npm ci
- name: Run Code PushUp action
uses: ./.github/actions/code-pushup
with:
token: ${{ secrets.GITHUB_TOKEN }}
mode: monorepo
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,5 @@ vite.config.*.timestamp*
vitest.config.*.timestamp*
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md

code-pushup.config.bundled_*.mjs
59 changes: 18 additions & 41 deletions code-pushup.config.ts
Original file line number Diff line number Diff line change
@@ -1,50 +1,27 @@
import 'dotenv/config';
import {
axeCoreConfig,
coverageCoreConfigNx,
eslintCoreConfigNx,
jsDocsCoreConfig,
jsPackagesCoreConfig,
lighthouseCoreConfig,
typescriptPluginConfig,
configureCoveragePlugin,
configureEslintPlugin,
configureJsDocsPlugin,
configureJsPackagesPlugin,
configureLighthousePlugin,
configureTypescriptPlugin,
configureUpload,
} from './code-pushup.preset.js';
import type { CoreConfig } from './packages/models/src/index.js';
import { mergeConfigs } from './packages/utils/src/index.js';

const project = process.env['NX_TASK_TARGET_PROJECT'] || 'cli-workspace';

const config: CoreConfig = {
...(process.env['CP_API_KEY'] && {
upload: {
project,
organization: 'code-pushup',
server: 'https://api.staging.code-pushup.dev/graphql',
apiKey: process.env['CP_API_KEY'],
},
}),
plugins: [],
};
// TODO: replace with something meaningful, or move out of the repo
const TARGET_URL =
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/';

export default mergeConfigs(
config,
await coverageCoreConfigNx(),
await jsPackagesCoreConfig(),
await lighthouseCoreConfig(
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
),
await typescriptPluginConfig({
tsconfig: 'packages/cli/tsconfig.lib.json',
}),
await eslintCoreConfigNx(),
jsDocsCoreConfig([
'packages/**/src/**/*.ts',
'!packages/**/node_modules',
'!packages/**/{mocks,mock}',
'!**/*.{spec,test}.ts',
'!**/implementation/**',
'!**/internal/**',
]),
axeCoreConfig(
'https://github.com/code-pushup/cli?tab=readme-ov-file#code-pushup-cli/',
),
configureUpload(),
await configureEslintPlugin(),
await configureCoveragePlugin(),
await configureJsPackagesPlugin(),
configureTypescriptPlugin(),
configureJsDocsPlugin(),
await configureLighthousePlugin(TARGET_URL),
axeCoreConfig(TARGET_URL),
);
Loading