Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
3 changes: 3 additions & 0 deletions .projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,6 @@ const repoProject = new yarn.Monorepo({
},
});

new AdcPublishing(repoProject);

// Eslint for projen config
// @ts-ignore
repoProject.eslint = new pj.javascript.Eslint(repoProject, {
Expand All @@ -236,6 +234,12 @@ repoProject.eslint = new pj.javascript.Eslint(repoProject, {
fileExtensions: ['.ts', '.tsx'],
lintProjenRc: false,
});
// always lint projen files as part of the build
if (repoProject.eslint?.eslintTask) {
repoProject.tasks.tryFind('build')?.spawn(repoProject.eslint?.eslintTask);
}

new AdcPublishing(repoProject);

const repo = configureProject(repoProject);

Expand Down
12 changes: 6 additions & 6 deletions projenrc/adc-publishing.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Monorepo } from "cdklabs-projen-project-types/lib/yarn";
import { Component, github } from "projen";
import { JobPermission } from "projen/lib/github/workflows-model";
import { Monorepo } from 'cdklabs-projen-project-types/lib/yarn';
import { Component, github } from 'projen';
import { JobPermission } from 'projen/lib/github/workflows-model';

export class AdcPublishing extends Component {
constructor(private readonly project_: Monorepo) {
Expand All @@ -22,19 +22,19 @@ export class AdcPublishing extends Component {
with: {
name: 'standalone_build-artifact',
path: 'dist/standalone',
overwrite: true
overwrite: true,
},
});

releaseWf.addJob('standalone_release_adc', {
name: 'standalone: publish to ADC',
environment: 'releasing', // <-- this has the configuration
environment: 'releasing', // <-- this has the configuration
needs: ['release'],
runsOn: ['ubuntu-latest'],
permissions: {
contents: JobPermission.WRITE,
},
if: `\${{ needs.release.outputs.latest_commit == github.sha }}`,
if: '${{ needs.release.outputs.latest_commit == github.sha }}',
steps: [
{
uses: 'actions/setup-node@v4',
Expand Down
1 change: 0 additions & 1 deletion projenrc/build-standalone-zip.task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { glob } from 'glob';
async function main() {
const outdir = await fs.mkdtemp(path.join(os.tmpdir(), 'bundling'));
try {

const pkgs = ['aws-cdk'];
// this is a build task, so we are safe either way
// eslint-disable-next-line @cdklabs/promiseall-no-unbounded-parallelism
Expand Down
10 changes: 5 additions & 5 deletions projenrc/codecov.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Component, github } from "projen";
import { JobPermission } from "projen/lib/github/workflows-model";
import { TypeScriptProject } from "projen/lib/typescript";
import { Component, github } from 'projen';
import { JobPermission } from 'projen/lib/github/workflows-model';
import { TypeScriptProject } from 'projen/lib/typescript';

export interface CodeCovWorkflowProps {
readonly restrictToRepos: string[];
Expand Down Expand Up @@ -52,10 +52,10 @@ export class CodeCovWorkflow extends Component {
files: props.packages.map(p => `packages/${p}/coverage/cobertura-coverage.xml`).join(','),
fail_ci_if_error: true,
flags: 'suite.unit',
use_oidc: true
use_oidc: true,
},
},
],
});
}
}
}
8 changes: 4 additions & 4 deletions projenrc/jsii.ts
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,10 @@ export class JsiiBuild extends pj.Component {
target: JsiiPacmakTarget,
packTask: pj.Task,
): {
publishTools: Tools;
bootstrapSteps: Array<Step>;
packagingSteps: Array<Step>;
} {
publishTools: Tools;
bootstrapSteps: Array<Step>;
packagingSteps: Array<Step>;
} {
const bootstrapSteps: Array<Step> = [];
const packagingSteps: Array<Step> = [];

Expand Down
Loading