Merge branch 'main' into huijbers/fix-init

mergify[bot] · web-flow · commit b38d1255f488 · 2022-09-20T09:50:09.000Z
diff --git a/CHANGELOG.v2.alpha.md b/CHANGELOG.v2.alpha.md
@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.42.1-alpha.0](https://github.com/aws/aws-cdk/compare/v2.42.0-alpha.0...v2.42.1-alpha.0) (2022-09-19)
+
 ## [2.42.0-alpha.0](https://github.com/aws/aws-cdk/compare/v2.41.0-alpha.0...v2.42.0-alpha.0) (2022-09-15)
 
 
diff --git a/CHANGELOG.v2.md b/CHANGELOG.v2.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.42.1](https://github.com/aws/aws-cdk/compare/v2.42.0...v2.42.1) (2022-09-19)
+
+
+### Reverts
+
+* **init-templates:** csharp and fsharp app init fails when path contains space ([#22112](https://github.com/aws/aws-cdk/issues/22112)) ([89f64d4](https://github.com/aws/aws-cdk/commit/89f64d4082d1a339caa1eab04a9ffc63b9088d9a)), closes [aws/aws-cdk#21049](https://github.com/aws/aws-cdk/issues/21049)
+
 ## [2.42.0](https://github.com/aws/aws-cdk/compare/v2.41.0...v2.42.0) (2022-09-15)
 
 
diff --git a/tools/@aws-cdk/prlint/lint.ts b/tools/@aws-cdk/prlint/lint.ts
@@ -122,6 +122,16 @@ function validateBreakingChangeFormat(title: string, body: string) {
   }
 }
 
+/**
+ * Check that the PR title has the correct prefix.
+ */
+function validateTitlePrefix(title: string) {
+    const titleRe = /^(feat|fix|build|chore|ci|docs|style|refactor|perf|test)(\([\w-]+\)){0,1}: /;
+    if (!titleRe.exec(title)) {
+      throw new LinterError("❗️ The title of this PR must have the correct conventional prefix");
+    }
+}
+
 function assertStability(title: string, body: string) {
   const breakingStable = breakingModules(title, body)
     .filter(mod => 'stable' === moduleStability(findModulePath(mod)));
@@ -138,24 +148,24 @@ export async function validatePr(number: number) {
   }
 
   const gh = createGitHubClient();
-  
+
   const issues = gh.getIssues(OWNER, REPO);
   const repo = gh.getRepo(OWNER, REPO);
-  
+
   console.log(`⌛  Fetching PR number ${number}`);
   const issue = (await issues.getIssue(number)).data;
-  
+
   console.log(`⌛  Fetching files for PR number ${number}`);
   const files = (await repo.listPullRequestFiles(number)).data;
-  
+
   console.log("⌛  Validating...");
-  
+
   if (shouldExemptReadme(issue)) {
     console.log(`Not validating README changes since the PR is labeled with '${EXEMPT_README}'`);
   } else {
     featureContainsReadme(issue, files);
   }
-  
+
   if (shouldExemptTest(issue)) {
     console.log(`Not validating test changes since the PR is labeled with '${EXEMPT_TEST}'`);
   } else {
@@ -168,14 +178,16 @@ export async function validatePr(number: number) {
   } else {
     featureContainsIntegTest(issue, files);
   }
- 
+  
   validateBreakingChangeFormat(issue.title, issue.body);
   if (shouldExemptBreakingChange(issue)) {
     console.log(`Not validating breaking changes since the PR is labeled with '${EXEMPT_BREAKING_CHANGE}'`);
   } else {
     assertStability(issue.title, issue.body);
   }
 
+  validateTitlePrefix(issue.title);
+
   console.log("✅  Success");
 }
 
diff --git a/version.v2.json b/version.v2.json
@@ -1,4 +1,4 @@
 {
-  "version": "2.42.0",
-  "alphaVersion": "2.42.0-alpha.0"
+  "version": "2.42.1",
+  "alphaVersion": "2.42.1-alpha.0"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`{`
`2`		`- "version": "2.42.0",`
`3`		`- "alphaVersion": "2.42.0-alpha.0"`
	`2`	`+ "version": "2.42.1",`
	`3`	`+ "alphaVersion": "2.42.1-alpha.0"`
`4`	`4`	`}`