Skip to content

Commit

Permalink
Merge branch 'master' into nija-at/featureflag-contributionguide
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Feb 16, 2021
2 parents 3e5b71c + b984b19 commit c67569c
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions tools/cdk-build-tools/lib/feature-flag.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ export function testFutureBehavior<T>(

const major = cdkMajorVersion(repoRoot);
if (major === 2) {
// Temporaily disable CDKv2 behaviour
// const app = new cdkApp();
// return test(name, async () => fn(app));
const app = new cdkApp();
return test(name, async () => fn(app));
}
const app = new cdkApp({ context: flags });
return test(name, () => fn(app));
Expand All @@ -59,8 +58,7 @@ export function testLegacyBehavior<T>(

const major = cdkMajorVersion(repoRoot);
if (major === 2) {
// Temporarily disable CDKv2 behaviour
// return;
return;
}
const app = new cdkApp();
return test(name, () => fn(app));
Expand All @@ -78,4 +76,4 @@ function cdkMajorVersion(repoRoot: string) {
throw new Error(`version ${ver} is not a semver`);
}
return sem.major;
}
}

0 comments on commit c67569c

Please sign in to comment.