Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.
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
31 changes: 9 additions & 22 deletions .github/actions/conventional-pr/src/conventional-pr.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
import * as core from '@actions/core';
import * as github from '@actions/github';

import {
validateTitle,
validateBody,
validateBaseBranch,
PullRequestInfo,
isRelease,
} from './utils';
import { validateTitle, validateBody, PullRequestInfo } from './utils';

const OWNER = github.context.repo.owner;
const REPO = github.context.repo.repo;
Expand Down Expand Up @@ -57,30 +51,23 @@ async function run() {
return;
}

if (!isRelease(pr)) {
const titleErrors = validateTitle(pr.title);
const bodyErrors = validateBody(pr.body);
const branchErrors = validateBaseBranch(pr.title, pr.baseRefName);
const titleErrors = validateTitle(pr.title);
const bodyErrors = validateBody(pr.body);

if (titleErrors.length) {
core.setFailed(titleErrors.join('\n'));
}

if (bodyErrors.length) {
core.setFailed(bodyErrors.join('\n'));
}
if (titleErrors.length) {
core.setFailed(titleErrors.join('\n'));
}

if (branchErrors.length) {
core.setFailed(branchErrors.join('\n'));
}
if (bodyErrors.length) {
core.setFailed(bodyErrors.join('\n'));
}
} catch (err) {
core.error(err);
core.setFailed('Error getting Pull Request data.');
}
}

run().catch(err => {
run().catch((err) => {
core.error(err);
core.setFailed('Error verifying conventional PR.');
});
27 changes: 3 additions & 24 deletions .github/actions/conventional-pr/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const validTypes = [
'a11y',
];

const typeList = validTypes.map(t => ` - ${t}`).join('\n');
const typeList = validTypes.map((t) => ` - ${t}`).join('\n');

export function validateTitle(title: string): ValidationResult {
const errors: ValidationResult = [];
Expand All @@ -34,7 +34,7 @@ export function validateTitle(title: string): ValidationResult {
errors.push('[Title] Must be present.');
}

const hastype = validTypes.some(t => title.startsWith(`${t}: `));
const hastype = validTypes.some((t) => title.startsWith(`${t}: `));

if (!hastype) {
errors.push(
Expand All @@ -45,7 +45,7 @@ export function validateTitle(title: string): ValidationResult {
return errors;
}

const refMatch = /((refs?|close(d|s)?|fix(ed|es)?) \#\d+)|(#minor)/i;
const refMatch = /((refs?|close(d|s)?|fix(ed|es)?) \#\d+)|(#minor)|(#release)/i;
const helpLink =
'https://help.github.com/en/github/managing-your-work-on-github/closing-issues-using-keywords';

Expand All @@ -60,24 +60,3 @@ export function validateBody(body: string): ValidationResult {

return errors;
}

export function isRelease(pr: PullRequestInfo) {
return pr.title.startsWith('release: ') && pr.baseRefName === 'stable';
}

export function validateBaseBranch(
title: string,
baseBranch: string
): ValidationResult {
let errors: ValidationResult = [];

if (title.startsWith('release: ') && baseBranch !== 'stable') {
errors.push("[Release] Release pull request must target 'stable' branch.");
} else if (baseBranch === 'stable') {
errors.push(
"[Branch] Pull requests cannot target 'stable' branch. Perhaps you meant to create a release or are targeting the wrong branch."
);
}

return errors;
}
340 changes: 340 additions & 0 deletions releases/1.0.0.md

Large diffs are not rendered by default.

86 changes: 86 additions & 0 deletions releases/1.0.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
# 1.0.1

## Summary

This release mostly contains small bug fixes and quality improvements.

## Highlights
- Update BotFramework SDK packages to 4.9.3 ([#3294](https://github.com/microsoft/BotFramework-Composer/pull/3294))
- Update BotFramework CLI libs to 4.9.1 ([#3217](https://github.com/microsoft/BotFramework-Composer/pull/3217))
- Fixed an issue where an unnecessary error was displayed after a long period of inactivity ([#3270](https://github.com/microsoft/BotFramework-Composer/pull/3270))
- Fixed an issue where lg files could become malformed ([#3141](https://github.com/microsoft/BotFramework-Composer/pull/3141))

## Full Changelog

#### Added

- feat: support endpoint for luis publish ([#3274](https://github.com/microsoft/BotFramework-Composer/pull/3274)) ([@lei9444](https://github.com/lei9444))
- feat: remove collapse component ([#3253](https://github.com/microsoft/BotFramework-Composer/pull/3253)) ([@lei9444](https://github.com/lei9444))
- feat: update runtime package to 4.9.2 ([#3207](https://github.com/microsoft/BotFramework-Composer/pull/3207)) ([@luhan2017](https://github.com/luhan2017))
- feat: add RemoveRecipientMention config to runtime ([#3139](https://github.com/microsoft/BotFramework-Composer/pull/3139)) ([@zidaneymar](https://github.com/zidaneymar))
- feat: update bf-lu to 4.9.1 ([#3217](https://github.com/microsoft/BotFramework-Composer/pull/3217)) ([@lei9444](https://github.com/lei9444))

#### Fixed

- fix: Silent auto updates now explicitly call the quitAndInstall() method ([#3306](https://github.com/microsoft/BotFramework-Composer/pull/3306)) ([@tonyanziano](https://github.com/tonyanziano))
- fix: load lu content need add system local ([#3281](https://github.com/microsoft/BotFramework-Composer/pull/3281)) ([@lei9444](https://github.com/lei9444))
- fix: suppress websocket error after connection lost ([#3270](https://github.com/microsoft/BotFramework-Composer/pull/3270)) ([@zhixzhan](https://github.com/zhixzhan))
- fix: Fixed csproj reference in solution, and fixed folder include ([#3258](https://github.com/microsoft/BotFramework-Composer/pull/3258)) ([@bartbilliet](https://github.com/bartbilliet))
- fix: allow custom actions to run in azure functions ([#3294](https://github.com/microsoft/BotFramework-Composer/pull/3294)) ([@luhan2017](https://github.com/luhan2017))
- fix: support import sections check when publishing luis ([#3154](https://github.com/microsoft/BotFramework-Composer/pull/3154)) ([@lei9444](https://github.com/lei9444))
- fix: Made rimraf a production dependency in @bfc/server ([#3280](https://github.com/microsoft/BotFramework-Composer/pull/3280)) ([@tonyanziano](https://github.com/tonyanziano))
- fix: prevent schema from being overwritten when ejecting ([#3215](https://github.com/microsoft/BotFramework-Composer/pull/3215)) ([@srinaath](https://github.com/srinaath))
- fix: disallow '.' in bot & dialog names ([#3200](https://github.com/microsoft/BotFramework-Composer/pull/3200)) ([@liweitian](https://github.com/liweitian))
- a11y: add labeled aria regions to pages ([#3259](https://github.com/microsoft/BotFramework-Composer/pull/3259)) ([@beyackle](https://github.com/beyackle))
- fix: update expression and publish doc links ([#3238](https://github.com/microsoft/BotFramework-Composer/pull/3238)) ([@zxyanliu](https://github.com/zxyanliu))
- fix: add settings file ignore ([#3179](https://github.com/microsoft/BotFramework-Composer/pull/3179)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: Use IStorage for skill's id factory ([#3137](https://github.com/microsoft/BotFramework-Composer/pull/3137)) ([@zidaneymar](https://github.com/zidaneymar))
- fix: remove luisauthoringkey and region from provision ([#3108](https://github.com/microsoft/BotFramework-Composer/pull/3108)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: lg file mess up ([#3141](https://github.com/microsoft/BotFramework-Composer/pull/3141)) ([@zhixzhan](https://github.com/zhixzhan))
- fix: Fixed expression array styling ([#3188](https://github.com/microsoft/BotFramework-Composer/pull/3188)) ([@tdurnford](https://github.com/tdurnford))
- fix: LUIS authoringKey used for endpoint calls instead of endpointKey ([#3165](https://github.com/microsoft/BotFramework-Composer/pull/3165)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: change label text 'design flow' to 'design' ([#3161](https://github.com/microsoft/BotFramework-Composer/pull/3161)) ([@liweitian](https://github.com/liweitian))
- fix: Updated the skill manifest editor to not reorder properties ([#3151](https://github.com/microsoft/BotFramework-Composer/pull/3151)) ([@tdurnford](https://github.com/tdurnford))
- fix: show all error messages in log ([#3129](https://github.com/microsoft/BotFramework-Composer/pull/3129)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: show code mess up the dialog content and the persistence layer block issue ([#3138](https://github.com/microsoft/BotFramework-Composer/pull/3138)) ([@lei9444](https://github.com/lei9444))
- fix: 'show code' button only showed first dialog ([#3127](https://github.com/microsoft/BotFramework-Composer/pull/3127)) ([@xieofxie](https://github.com/xieofxie))
- a11y: accessibility2854 ([#2914](https://github.com/microsoft/BotFramework-Composer/pull/2914)) ([@liweitian](https://github.com/liweitian))
- fix: absolute url in azure publish ([#3285](https://github.com/microsoft/BotFramework-Composer/pull/3285)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: a broken link on home screen ([#3169](https://github.com/microsoft/BotFramework-Composer/pull/3169)) ([@zxyanliu](https://github.com/zxyanliu))
- fix: ignore runtime folder zipping when local publish ([#3197](https://github.com/microsoft/BotFramework-Composer/pull/3197)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: Add tenantId to provision azure login ([#3195](https://github.com/microsoft/BotFramework-Composer/pull/3195)) ([@zidaneymar](https://github.com/zidaneymar))
- fix: Adds generated folder to zip archive ([#3201](https://github.com/microsoft/BotFramework-Composer/pull/3201)) ([@cwhitten](https://github.com/cwhitten))
- fix: Group MicrosoftAppId and MicrosoftPassword together in the settings page ([#3181](https://github.com/microsoft/BotFramework-Composer/pull/3181)) ([@VanyLaw](https://github.com/VanyLaw))
- fix: azure functions runtime, add configuration middleware ([#3128](https://github.com/microsoft/BotFramework-Composer/pull/3128)) ([@zidaneymar](https://github.com/zidaneymar))

#### Changed

- refactor: add useForm hook ([#3159](https://github.com/microsoft/BotFramework-Composer/pull/3159)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
- refactor: clean some code ([#3155](https://github.com/microsoft/BotFramework-Composer/pull/3155)) ([@liweitian](https://github.com/liweitian))
- style: Visual Editor node menu position, edge menu background ([#3194](https://github.com/microsoft/BotFramework-Composer/pull/3194)) ([@yeze322](https://github.com/yeze322))
- refactor: clean up the 'slot' abstraction for abs-h ([#3193](https://github.com/microsoft/BotFramework-Composer/pull/3193)) ([@lei9444](https://github.com/lei9444))
- style: set prettier end of line auto ([#3162](https://github.com/microsoft/BotFramework-Composer/pull/3162)) ([@lei9444](https://github.com/lei9444))

#### Other

- test: add unit tests for location browser ([#3256](https://github.com/microsoft/BotFramework-Composer/pull/3256)) ([@liweitian](https://github.com/liweitian))
- chore: remove unnecessary lg parsing ([#3218](https://github.com/microsoft/BotFramework-Composer/pull/3218)) ([@zhixzhan](https://github.com/zhixzhan))
- test: hardcode year in test for forward compatibility ([#3255](https://github.com/microsoft/BotFramework-Composer/pull/3255)) ([@luhan2017](https://github.com/luhan2017))
- chore: use default button instead of button ([#3223](https://github.com/microsoft/BotFramework-Composer/pull/3223)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
- test: create option test cases ([#3210](https://github.com/microsoft/BotFramework-Composer/pull/3210)) ([@liweitian](https://github.com/liweitian))
- ci: disable docker build workflow ([#3212](https://github.com/microsoft/BotFramework-Composer/pull/3212)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
- test: add unit test for client reducer ([#3209](https://github.com/microsoft/BotFramework-Composer/pull/3209)) ([@lei9444](https://github.com/lei9444))
- docs: Update README.md ([#3186](https://github.com/microsoft/BotFramework-Composer/pull/3186)) ([@mareekuh](https://github.com/mareekuh))
- test: add test for client navigation util ([#3202](https://github.com/microsoft/BotFramework-Composer/pull/3202)) ([@lei9444](https://github.com/lei9444))
- build: update typescript, eslint, prettier and more ([#3125](https://github.com/microsoft/BotFramework-Composer/pull/3125)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
- ci: update utils.ts to allow for "#minor" tag ([#3148](https://github.com/microsoft/BotFramework-Composer/pull/3148)) ([@beyackle](https://github.com/beyackle))
- ci: add base path for coveralls action ([#3131](https://github.com/microsoft/BotFramework-Composer/pull/3131)) ([@a-b-r-o-w-n](https://github.com/a-b-r-o-w-n))
- docs: update readme for 1.0 release ([#3122](https://github.com/microsoft/BotFramework-Composer/pull/3122)) ([@benbrown](https://github.com/benbrown))
- build: fix build warning about nopn async method ([#3282](https://github.com/microsoft/BotFramework-Composer/pull/3282)) ([@zidaneymar](https://github.com/zidaneymar))
- docs: itemTitle typo in add and delete dialogs ([#3279](https://github.com/microsoft/BotFramework-Composer/pull/3279)) ([@GeoffCoxMSFT](https://github.com/GeoffCoxMSFT))
- docs: use https for git clone ([#3276](https://github.com/microsoft/BotFramework-Composer/pull/3276)) ([@sammydeprez](https://github.com/sammydeprez))
- release: Update version fields for 1.0.1 ([#3305](https://github.com/microsoft/BotFramework-Composer/pull/3305)) ([@cwhitten](https://github.com/cwhitten))
- test: add dialogUtil test cases ([#3221](https://github.com/microsoft/BotFramework-Composer/pull/3221)) ([@liweitian](https://github.com/liweitian))
- docs: remove field from sample config ([#3203](https://github.com/microsoft/BotFramework-Composer/pull/3203)) ([@benbrown](https://github.com/benbrown))
- docs: Correct download links (mac and linux are swapped) ([#3150](https://github.com/microsoft/BotFramework-Composer/pull/3150)) ([@benbrown](https://github.com/benbrown))
- docs: fix incorrect passport link ([#3135](https://github.com/microsoft/BotFramework-Composer/pull/3135)) ([@ericchansen](https://github.com/ericchansen))
File renamed without changes.
File renamed without changes.
14 changes: 10 additions & 4 deletions scripts/generate-changelog.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ const AUTHORS = {
"Chris Whitten": "cwhitten",
"Dong Lei": "boydc2014",
"Gary Pretty": "garypretty",
"Geoff Cox (Microsoft)": "GeoffCoxMSFT",
"Hongyang Du (hond)": "Danieladu",
"Kamran Iqbal": "Kaiqb",
"Long Alan": "alanlong9278",
"Lu Han": "luhan2017",
"mareekuh": "mareekuh",
"Pooja Nagpal": "p-nagpal",
"Qi Kang": "zidaneymar",
"sangwoohaan": "srinaath",
Expand All @@ -32,11 +34,14 @@ const AUTHORS = {
VanyLaw: "VanyLaw",
xieofxie: "xieofxie",
zeye: "yeze322",
zhixzhan: "zhixzhan",
zhixzhan: "zhixzhan"
};

const getLog = () =>
execSync("git log --pretty=format:'%s | %an' stable..master")
const getLatestTag = () =>
execSync("git describe --tags $(git rev-list --tags --max-count=1)").toString().trim();

const getLog = (tag) =>
execSync(`git log --pretty=format:'%s | %an' ${tag}..master`)
.toString()
.split("\n");

Expand Down Expand Up @@ -143,7 +148,8 @@ const formatChangeLog = groups => {
};

function run() {
const commits = getLog();
const tag = getLatestTag();
const commits = getLog(tag);
const groups = groupCommits(commits);
const output = formatChangeLog(groups);
console.log(output);
Expand Down