release-please 14.0.0 → 14.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +17 -0
- package/build/src/bin/release-please.js +5 -0
- package/build/src/github.d.ts +1 -1
- package/build/src/github.js +14 -52
- package/build/src/manifest.d.ts +2 -0
- package/build/src/manifest.js +5 -3
- package/build/src/plugins/merge.d.ts +2 -1
- package/build/src/plugins/merge.js +6 -2
- package/build/src/strategies/base.d.ts +3 -1
- package/build/src/strategies/base.js +4 -3
- package/build/src/strategies/dotnet-yoshi.js +5 -2
- package/build/src/strategies/java-yoshi.d.ts +1 -1
- package/build/src/strategies/java.js +1 -0
- package/build/src/strategies/php-yoshi.js +1 -0
- package/build/src/update.d.ts +1 -1
- package/build/src/updaters/release-please-config.js +1 -0
- package/package.json +5 -3
- package/schemas/config.json +11 -0
- package/build/src/util/file-cache.d.ts +0 -104
- package/build/src/util/file-cache.js +0 -208
package/CHANGELOG.md
CHANGED
|
@@ -4,6 +4,23 @@
|
|
|
4
4
|
|
|
5
5
|
[1]: https://www.npmjs.com/package/release-please?activeTab=versions
|
|
6
6
|
|
|
7
|
+
## [14.1.0](https://github.com/googleapis/release-please/compare/v14.0.0...v14.1.0) (2022-08-19)
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
### Features
|
|
11
|
+
|
|
12
|
+
* Allow $schema key in manifest config schema ([#1584](https://github.com/googleapis/release-please/issues/1584)) ([d0d43a0](https://github.com/googleapis/release-please/commit/d0d43a0f15d44941c2338f3c8e8c9f972fb45938))
|
|
13
|
+
* customize pr body header ([#1579](https://github.com/googleapis/release-please/issues/1579)) ([92e1366](https://github.com/googleapis/release-please/commit/92e13664bc5a7c4b849f3cea367944280e20b894))
|
|
14
|
+
* use file-cache from git-file-utils ([#1585](https://github.com/googleapis/release-please/issues/1585)) ([e0572f8](https://github.com/googleapis/release-please/commit/e0572f899202ddbad995e8ff21621166d7aae07e))
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* convert `MissingFileError` thrown by `git-file-utils` ([#1590](https://github.com/googleapis/release-please/issues/1590)) ([cf4f0a3](https://github.com/googleapis/release-please/commit/cf4f0a3068a049cac99d191f40195c686baee413))
|
|
20
|
+
* correct $schema format in manifest config schema ([#1589](https://github.com/googleapis/release-please/issues/1589)) ([e25537b](https://github.com/googleapis/release-please/commit/e25537b559d56c46aedba1e83f7dda7c6825781f))
|
|
21
|
+
* **deps:** update git-file-utils to 1.1.0 ([297a7b7](https://github.com/googleapis/release-please/commit/297a7b7ef862b7aa5e64a6077f86d674eefc140e))
|
|
22
|
+
* use git-file-utils' cache for file search ([#1588](https://github.com/googleapis/release-please/issues/1588)) ([297a7b7](https://github.com/googleapis/release-please/commit/297a7b7ef862b7aa5e64a6077f86d674eefc140e))
|
|
23
|
+
|
|
7
24
|
## [14.0.0](https://github.com/googleapis/release-please/compare/v13.21.0...v14.0.0) (2022-08-15)
|
|
8
25
|
|
|
9
26
|
|
|
@@ -266,6 +266,10 @@ function taggingOptions(yargs) {
|
|
|
266
266
|
.option('pull-request-title-pattern', {
|
|
267
267
|
describe: 'Title pattern to make release PR',
|
|
268
268
|
type: 'string',
|
|
269
|
+
})
|
|
270
|
+
.option('pull-request-header', {
|
|
271
|
+
describe: 'Header for release PR',
|
|
272
|
+
type: 'string',
|
|
269
273
|
});
|
|
270
274
|
}
|
|
271
275
|
const createReleasePullRequestCommand = {
|
|
@@ -290,6 +294,7 @@ const createReleasePullRequestCommand = {
|
|
|
290
294
|
changelogType: argv.changelogType,
|
|
291
295
|
changelogHost: argv.changelogHost,
|
|
292
296
|
pullRequestTitlePattern: argv.pullRequestTitlePattern,
|
|
297
|
+
pullRequestHeader: argv.pullRequestHeader,
|
|
293
298
|
changelogSections: argv.changelogSections,
|
|
294
299
|
releaseAs: argv.releaseAs,
|
|
295
300
|
versioning: argv.versioningStrategy,
|
package/build/src/github.d.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { Repository } from './repository';
|
|
|
9
9
|
import { ReleasePullRequest } from './release-pull-request';
|
|
10
10
|
import { Update } from './update';
|
|
11
11
|
import { Release } from './release';
|
|
12
|
-
import { GitHubFileContents } from '
|
|
12
|
+
import { GitHubFileContents } from '@google-automations/git-file-utils';
|
|
13
13
|
declare type RequestBuilderType = typeof request;
|
|
14
14
|
declare type DefaultFunctionType = RequestBuilderType['defaults'];
|
|
15
15
|
declare type RequestFunctionType = ReturnType<DefaultFunctionType>;
|
package/build/src/github.js
CHANGED
|
@@ -27,7 +27,7 @@ exports.GH_GRAPHQL_URL = 'https://api.github.com';
|
|
|
27
27
|
const logger_1 = require("./util/logger");
|
|
28
28
|
const manifest_1 = require("./manifest");
|
|
29
29
|
const signoff_commit_message_1 = require("./util/signoff-commit-message");
|
|
30
|
-
const
|
|
30
|
+
const git_file_utils_1 = require("@google-automations/git-file-utils");
|
|
31
31
|
class GitHub {
|
|
32
32
|
constructor(options) {
|
|
33
33
|
/**
|
|
@@ -107,30 +107,7 @@ class GitHub {
|
|
|
107
107
|
prefix = normalizePrefix(prefix);
|
|
108
108
|
}
|
|
109
109
|
logger_1.logger.debug(`finding files by filename: ${filename}, ref: ${ref}, prefix: ${prefix}`);
|
|
110
|
-
|
|
111
|
-
owner: this.repository.owner,
|
|
112
|
-
repo: this.repository.repo,
|
|
113
|
-
tree_sha: ref,
|
|
114
|
-
recursive: 'true',
|
|
115
|
-
});
|
|
116
|
-
return response.data.tree
|
|
117
|
-
.filter(file => {
|
|
118
|
-
const path = file.path;
|
|
119
|
-
return (path &&
|
|
120
|
-
// match the filename
|
|
121
|
-
path.endsWith(filename) &&
|
|
122
|
-
// match the prefix if provided
|
|
123
|
-
(!prefix || path.startsWith(`${prefix}/`)));
|
|
124
|
-
})
|
|
125
|
-
.map(file => {
|
|
126
|
-
let path = file.path;
|
|
127
|
-
// strip the prefix if provided
|
|
128
|
-
if (prefix) {
|
|
129
|
-
const pfix = new RegExp(`^${prefix}[/\\\\]`);
|
|
130
|
-
path = path.replace(pfix, '');
|
|
131
|
-
}
|
|
132
|
-
return path;
|
|
133
|
-
});
|
|
110
|
+
return await this.fileCache.findFilesByFilename(filename, ref, prefix);
|
|
134
111
|
});
|
|
135
112
|
this.createPullRequest = wrapAsync(async (pullRequest, targetBranch, message, updates, options) => {
|
|
136
113
|
// Update the files for the release if not already supplied
|
|
@@ -245,30 +222,7 @@ class GitHub {
|
|
|
245
222
|
if (prefix) {
|
|
246
223
|
prefix = normalizePrefix(prefix);
|
|
247
224
|
}
|
|
248
|
-
|
|
249
|
-
owner: this.repository.owner,
|
|
250
|
-
repo: this.repository.repo,
|
|
251
|
-
tree_sha: ref,
|
|
252
|
-
recursive: 'true',
|
|
253
|
-
});
|
|
254
|
-
return response.data.tree
|
|
255
|
-
.filter(file => {
|
|
256
|
-
const path = file.path;
|
|
257
|
-
return (path &&
|
|
258
|
-
// match the file extension
|
|
259
|
-
path.endsWith(`.${extension}`) &&
|
|
260
|
-
// match the prefix if provided
|
|
261
|
-
(!prefix || path.startsWith(`${prefix}/`)));
|
|
262
|
-
})
|
|
263
|
-
.map(file => {
|
|
264
|
-
let path = file.path;
|
|
265
|
-
// strip the prefix if provided
|
|
266
|
-
if (prefix) {
|
|
267
|
-
const pfix = new RegExp(`^${prefix}[/\\\\]`);
|
|
268
|
-
path = path.replace(pfix, '');
|
|
269
|
-
}
|
|
270
|
-
return path;
|
|
271
|
-
});
|
|
225
|
+
return this.fileCache.findFilesByExtension(extension, ref, prefix);
|
|
272
226
|
});
|
|
273
227
|
/**
|
|
274
228
|
* Create a GitHub release
|
|
@@ -368,7 +322,7 @@ class GitHub {
|
|
|
368
322
|
this.octokit = options.octokitAPIs.octokit;
|
|
369
323
|
this.request = options.octokitAPIs.request;
|
|
370
324
|
this.graphql = options.octokitAPIs.graphql;
|
|
371
|
-
this.fileCache = new
|
|
325
|
+
this.fileCache = new git_file_utils_1.RepositoryFileCache(this.octokit, this.repository);
|
|
372
326
|
}
|
|
373
327
|
/**
|
|
374
328
|
* Build a new GitHub client with auto-detected default branch.
|
|
@@ -852,7 +806,15 @@ class GitHub {
|
|
|
852
806
|
*/
|
|
853
807
|
async getFileContentsOnBranch(path, branch) {
|
|
854
808
|
logger_1.logger.debug(`Fetching ${path} from branch ${branch}`);
|
|
855
|
-
|
|
809
|
+
try {
|
|
810
|
+
return await this.fileCache.getFileContents(path, branch);
|
|
811
|
+
}
|
|
812
|
+
catch (e) {
|
|
813
|
+
if (e instanceof git_file_utils_1.FileNotFoundError) {
|
|
814
|
+
throw new errors_1.FileNotFoundError(path);
|
|
815
|
+
}
|
|
816
|
+
throw e;
|
|
817
|
+
}
|
|
856
818
|
}
|
|
857
819
|
async getFileJson(path, branch) {
|
|
858
820
|
const content = await this.getFileContentsOnBranch(path, branch);
|
|
@@ -934,7 +896,7 @@ class GitHub {
|
|
|
934
896
|
changes.set(update.path, {
|
|
935
897
|
content: updatedContent,
|
|
936
898
|
originalContent: (content === null || content === void 0 ? void 0 : content.parsedContent) || null,
|
|
937
|
-
mode: (content === null || content === void 0 ? void 0 : content.mode) ||
|
|
899
|
+
mode: (content === null || content === void 0 ? void 0 : content.mode) || git_file_utils_1.DEFAULT_FILE_MODE,
|
|
938
900
|
});
|
|
939
901
|
}
|
|
940
902
|
}
|
package/build/src/manifest.d.ts
CHANGED
|
@@ -43,6 +43,7 @@ export interface ReleaserConfig {
|
|
|
43
43
|
includeComponentInTag?: boolean;
|
|
44
44
|
includeVInTag?: boolean;
|
|
45
45
|
pullRequestTitlePattern?: string;
|
|
46
|
+
pullRequestHeader?: string;
|
|
46
47
|
tagSeparator?: string;
|
|
47
48
|
separatePullRequests?: boolean;
|
|
48
49
|
labels?: string[];
|
|
@@ -85,6 +86,7 @@ interface ReleaserConfigJson {
|
|
|
85
86
|
'changelog-type'?: ChangelogNotesType;
|
|
86
87
|
'changelog-host'?: string;
|
|
87
88
|
'pull-request-title-pattern'?: string;
|
|
89
|
+
'pull-request-header'?: string;
|
|
88
90
|
'separate-pull-requests'?: boolean;
|
|
89
91
|
'tag-separator'?: string;
|
|
90
92
|
'extra-files'?: ExtraFile[];
|
package/build/src/manifest.js
CHANGED
|
@@ -730,6 +730,7 @@ function extractReleaserConfig(config) {
|
|
|
730
730
|
includeVInTag: config['include-v-in-tag'],
|
|
731
731
|
changelogType: config['changelog-type'],
|
|
732
732
|
pullRequestTitlePattern: config['pull-request-title-pattern'],
|
|
733
|
+
pullRequestHeader: config['pull-request-header'],
|
|
733
734
|
tagSeparator: config['tag-separator'],
|
|
734
735
|
separatePullRequests: config['separate-pull-requests'],
|
|
735
736
|
labels: (_a = config['label']) === null || _a === void 0 ? void 0 : _a.split(','),
|
|
@@ -941,7 +942,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, config,
|
|
|
941
942
|
return candidateTagVersion.sort((a, b) => b.compare(a))[0];
|
|
942
943
|
}
|
|
943
944
|
function mergeReleaserConfig(defaultConfig, pathConfig) {
|
|
944
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
|
|
945
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
|
|
945
946
|
return {
|
|
946
947
|
releaseType: (_b = (_a = pathConfig.releaseType) !== null && _a !== void 0 ? _a : defaultConfig.releaseType) !== null && _b !== void 0 ? _b : 'node',
|
|
947
948
|
bumpMinorPreMajor: (_c = pathConfig.bumpMinorPreMajor) !== null && _c !== void 0 ? _c : defaultConfig.bumpMinorPreMajor,
|
|
@@ -963,8 +964,9 @@ function mergeReleaserConfig(defaultConfig, pathConfig) {
|
|
|
963
964
|
includeVInTag: (_u = pathConfig.includeVInTag) !== null && _u !== void 0 ? _u : defaultConfig.includeVInTag,
|
|
964
965
|
tagSeparator: (_v = pathConfig.tagSeparator) !== null && _v !== void 0 ? _v : defaultConfig.tagSeparator,
|
|
965
966
|
pullRequestTitlePattern: (_w = pathConfig.pullRequestTitlePattern) !== null && _w !== void 0 ? _w : defaultConfig.pullRequestTitlePattern,
|
|
966
|
-
|
|
967
|
-
|
|
967
|
+
pullRequestHeader: (_x = pathConfig.pullRequestHeader) !== null && _x !== void 0 ? _x : defaultConfig.pullRequestHeader,
|
|
968
|
+
separatePullRequests: (_y = pathConfig.separatePullRequests) !== null && _y !== void 0 ? _y : defaultConfig.separatePullRequests,
|
|
969
|
+
skipSnapshot: (_z = pathConfig.skipSnapshot) !== null && _z !== void 0 ? _z : defaultConfig.skipSnapshot,
|
|
968
970
|
};
|
|
969
971
|
}
|
|
970
972
|
/**
|
|
@@ -9,6 +9,7 @@ import { GitHub } from '../github';
|
|
|
9
9
|
*/
|
|
10
10
|
export declare class Merge extends ManifestPlugin {
|
|
11
11
|
private pullRequestTitlePattern?;
|
|
12
|
-
|
|
12
|
+
private pullRequestHeader?;
|
|
13
|
+
constructor(github: GitHub, targetBranch: string, repositoryConfig: RepositoryConfig, pullRequestTitlePattern?: string, pullRequestHeader?: string);
|
|
13
14
|
run(candidates: CandidateReleasePullRequest[]): Promise<CandidateReleasePullRequest[]>;
|
|
14
15
|
}
|
|
@@ -28,10 +28,11 @@ const logger_1 = require("../util/logger");
|
|
|
28
28
|
* Release notes are broken up using `<summary>`/`<details>` blocks.
|
|
29
29
|
*/
|
|
30
30
|
class Merge extends plugin_1.ManifestPlugin {
|
|
31
|
-
constructor(github, targetBranch, repositoryConfig, pullRequestTitlePattern) {
|
|
31
|
+
constructor(github, targetBranch, repositoryConfig, pullRequestTitlePattern, pullRequestHeader) {
|
|
32
32
|
super(github, targetBranch, repositoryConfig);
|
|
33
33
|
this.pullRequestTitlePattern =
|
|
34
34
|
pullRequestTitlePattern || manifest_1.MANIFEST_PULL_REQUEST_TITLE_PATTERN;
|
|
35
|
+
this.pullRequestHeader = pullRequestHeader;
|
|
35
36
|
}
|
|
36
37
|
async run(candidates) {
|
|
37
38
|
if (candidates.length < 1) {
|
|
@@ -65,7 +66,10 @@ class Merge extends plugin_1.ManifestPlugin {
|
|
|
65
66
|
const updates = (0, composite_1.mergeUpdates)(rawUpdates);
|
|
66
67
|
const pullRequest = {
|
|
67
68
|
title: pull_request_title_1.PullRequestTitle.ofComponentTargetBranchVersion(rootRelease === null || rootRelease === void 0 ? void 0 : rootRelease.pullRequest.title.component, this.targetBranch, rootRelease === null || rootRelease === void 0 ? void 0 : rootRelease.pullRequest.title.version, this.pullRequestTitlePattern),
|
|
68
|
-
body: new pull_request_body_1.PullRequestBody(releaseData, {
|
|
69
|
+
body: new pull_request_body_1.PullRequestBody(releaseData, {
|
|
70
|
+
useComponents: true,
|
|
71
|
+
header: this.pullRequestHeader,
|
|
72
|
+
}),
|
|
69
73
|
updates,
|
|
70
74
|
labels: Array.from(labels),
|
|
71
75
|
headRefName: branch_name_1.BranchName.ofTargetBranch(this.targetBranch).toString(),
|
|
@@ -40,6 +40,7 @@ export interface BaseStrategyOptions {
|
|
|
40
40
|
includeComponentInTag?: boolean;
|
|
41
41
|
includeVInTag?: boolean;
|
|
42
42
|
pullRequestTitlePattern?: string;
|
|
43
|
+
pullRequestHeader?: string;
|
|
43
44
|
extraFiles?: ExtraFile[];
|
|
44
45
|
versionFile?: string;
|
|
45
46
|
snapshotLabels?: string[];
|
|
@@ -65,6 +66,7 @@ export declare abstract class BaseStrategy implements Strategy {
|
|
|
65
66
|
protected includeComponentInTag: boolean;
|
|
66
67
|
protected includeVInTag: boolean;
|
|
67
68
|
readonly pullRequestTitlePattern?: string;
|
|
69
|
+
readonly pullRequestHeader?: string;
|
|
68
70
|
readonly extraFiles: ExtraFile[];
|
|
69
71
|
readonly changelogNotes: ChangelogNotes;
|
|
70
72
|
protected changelogSections?: ChangelogSection[];
|
|
@@ -91,7 +93,7 @@ export declare abstract class BaseStrategy implements Strategy {
|
|
|
91
93
|
*/
|
|
92
94
|
protected postProcessCommits(commits: ConventionalCommit[]): Promise<ConventionalCommit[]>;
|
|
93
95
|
protected buildReleaseNotes(conventionalCommits: ConventionalCommit[], newVersion: Version, newVersionTag: TagName, latestRelease?: Release, commits?: Commit[]): Promise<string>;
|
|
94
|
-
protected buildPullRequestBody(component: string | undefined, newVersion: Version, releaseNotesBody: string, _conventionalCommits: ConventionalCommit[], _latestRelease?: Release): Promise<PullRequestBody>;
|
|
96
|
+
protected buildPullRequestBody(component: string | undefined, newVersion: Version, releaseNotesBody: string, _conventionalCommits: ConventionalCommit[], _latestRelease?: Release, pullRequestHeader?: string): Promise<PullRequestBody>;
|
|
95
97
|
/**
|
|
96
98
|
* Builds a candidate release pull request
|
|
97
99
|
* @param {Commit[]} commits Raw commits to consider for this release.
|
|
@@ -58,6 +58,7 @@ class BaseStrategy {
|
|
|
58
58
|
this.includeComponentInTag = (_a = options.includeComponentInTag) !== null && _a !== void 0 ? _a : true;
|
|
59
59
|
this.includeVInTag = (_b = options.includeVInTag) !== null && _b !== void 0 ? _b : true;
|
|
60
60
|
this.pullRequestTitlePattern = options.pullRequestTitlePattern;
|
|
61
|
+
this.pullRequestHeader = options.pullRequestHeader;
|
|
61
62
|
this.extraFiles = options.extraFiles || [];
|
|
62
63
|
}
|
|
63
64
|
/**
|
|
@@ -113,14 +114,14 @@ class BaseStrategy {
|
|
|
113
114
|
commits: commits,
|
|
114
115
|
});
|
|
115
116
|
}
|
|
116
|
-
async buildPullRequestBody(component, newVersion, releaseNotesBody, _conventionalCommits, _latestRelease) {
|
|
117
|
+
async buildPullRequestBody(component, newVersion, releaseNotesBody, _conventionalCommits, _latestRelease, pullRequestHeader) {
|
|
117
118
|
return new pull_request_body_1.PullRequestBody([
|
|
118
119
|
{
|
|
119
120
|
component,
|
|
120
121
|
version: newVersion,
|
|
121
122
|
notes: releaseNotesBody,
|
|
122
123
|
},
|
|
123
|
-
]);
|
|
124
|
+
], { header: pullRequestHeader });
|
|
124
125
|
}
|
|
125
126
|
/**
|
|
126
127
|
* Builds a candidate release pull request
|
|
@@ -163,7 +164,7 @@ class BaseStrategy {
|
|
|
163
164
|
latestVersion: latestRelease === null || latestRelease === void 0 ? void 0 : latestRelease.tag.version,
|
|
164
165
|
});
|
|
165
166
|
const updatesWithExtras = (0, composite_1.mergeUpdates)(updates.concat(...this.extraFileUpdates(newVersion, versionsMap)));
|
|
166
|
-
const pullRequestBody = await this.buildPullRequestBody(component, newVersion, releaseNotesBody, conventionalCommits, latestRelease);
|
|
167
|
+
const pullRequestBody = await this.buildPullRequestBody(component, newVersion, releaseNotesBody, conventionalCommits, latestRelease, this.pullRequestHeader);
|
|
167
168
|
return {
|
|
168
169
|
title: pullRequestTitle,
|
|
169
170
|
body: pullRequestBody,
|
|
@@ -34,15 +34,18 @@ const CHANGELOG_SECTIONS = [
|
|
|
34
34
|
];
|
|
35
35
|
const DEFAULT_CHANGELOG_PATH = 'docs/history.md';
|
|
36
36
|
const DEFAULT_PULL_REQUEST_TITLE_PATTERN = 'Release${component} version ${version}';
|
|
37
|
+
const DEFAULT_PULL_REQUEST_HEADER = ':robot: I have created a release *beep* *boop*';
|
|
37
38
|
const RELEASE_NOTES_HEADER_PATTERN = /#{2,3} \[?(\d+\.\d+\.\d+-?[^\]]*)\]?.* \((\d{4}-\d{2}-\d{2})\)/;
|
|
38
39
|
class DotnetYoshi extends base_1.BaseStrategy {
|
|
39
40
|
constructor(options) {
|
|
40
|
-
var _a, _b, _c, _d;
|
|
41
|
+
var _a, _b, _c, _d, _e;
|
|
41
42
|
options.changelogSections = (_a = options.changelogSections) !== null && _a !== void 0 ? _a : CHANGELOG_SECTIONS;
|
|
42
43
|
options.changelogPath = (_b = options.changelogPath) !== null && _b !== void 0 ? _b : DEFAULT_CHANGELOG_PATH;
|
|
43
44
|
options.pullRequestTitlePattern =
|
|
44
45
|
(_c = options.pullRequestTitlePattern) !== null && _c !== void 0 ? _c : DEFAULT_PULL_REQUEST_TITLE_PATTERN;
|
|
45
|
-
options.
|
|
46
|
+
options.pullRequestHeader =
|
|
47
|
+
(_d = options.pullRequestHeader) !== null && _d !== void 0 ? _d : DEFAULT_PULL_REQUEST_HEADER;
|
|
48
|
+
options.includeVInTag = (_e = options.includeVInTag) !== null && _e !== void 0 ? _e : false;
|
|
46
49
|
super(options);
|
|
47
50
|
}
|
|
48
51
|
async buildReleaseNotes(conventionalCommits, newVersion, newVersionTag, latestRelease) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Update } from '../update';
|
|
2
2
|
import { Version, VersionsMap } from '../version';
|
|
3
|
-
import { GitHubFileContents } from '
|
|
3
|
+
import { GitHubFileContents } from '@google-automations/git-file-utils';
|
|
4
4
|
import { ConventionalCommit } from '../commit';
|
|
5
5
|
import { Java, JavaBuildUpdatesOption } from './java';
|
|
6
6
|
export declare class JavaYoshi extends Java {
|
|
@@ -79,6 +79,7 @@ class Java extends base_1.BaseStrategy {
|
|
|
79
79
|
? branch_name_1.BranchName.ofComponentTargetBranch(component, this.targetBranch)
|
|
80
80
|
: branch_name_1.BranchName.ofTargetBranch(this.targetBranch);
|
|
81
81
|
const notes = '### Updating meta-information for bleeding-edge SNAPSHOT release.';
|
|
82
|
+
// TODO use pullrequest header here?
|
|
82
83
|
const pullRequestBody = new pull_request_body_1.PullRequestBody([
|
|
83
84
|
{
|
|
84
85
|
component,
|
package/build/src/update.d.ts
CHANGED
|
@@ -60,6 +60,7 @@ function releaserConfigToJsonConfig(config) {
|
|
|
60
60
|
'changelog-type': config.changelogType,
|
|
61
61
|
'changelog-host': config.changelogHost,
|
|
62
62
|
'pull-request-title-pattern': config.pullRequestTitlePattern,
|
|
63
|
+
'pull-request-header': config.pullRequestHeader,
|
|
63
64
|
'separate-pull-requests': config.separatePullRequests,
|
|
64
65
|
'tag-separator': config.tagSeparator,
|
|
65
66
|
'extra-files': config.extraFiles,
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "release-please",
|
|
3
|
-
"version": "14.
|
|
3
|
+
"version": "14.1.0",
|
|
4
4
|
"description": "generate release PRs based on the conventionalcommits.org spec",
|
|
5
5
|
"main": "./build/src/index.js",
|
|
6
6
|
"bin": "./build/src/bin/release-please.js",
|
|
7
7
|
"scripts": {
|
|
8
|
-
"test": "cross-env ENVIRONMENT=test c8 mocha --recursive --timeout=5000 build/test",
|
|
8
|
+
"test": "cross-env ENVIRONMENT=test LC_ALL=en c8 mocha --recursive --timeout=5000 build/test",
|
|
9
9
|
"docs": "echo add docs tests",
|
|
10
|
-
"test:snap": "SNAPSHOT_UPDATE=1 npm test",
|
|
10
|
+
"test:snap": "SNAPSHOT_UPDATE=1 LC_ALL=en npm test",
|
|
11
11
|
"clean": "gts clean",
|
|
12
12
|
"prepare": "npm run compile",
|
|
13
13
|
"lint": "gts check",
|
|
@@ -56,6 +56,7 @@
|
|
|
56
56
|
"@types/xmldom": "^0.1.31",
|
|
57
57
|
"@types/yargs": "^17.0.0",
|
|
58
58
|
"ajv": "^8.11.0",
|
|
59
|
+
"ajv-formats": "^2.1.1",
|
|
59
60
|
"c8": "^7.0.0",
|
|
60
61
|
"chai": "^4.2.0",
|
|
61
62
|
"cross-env": "^7.0.0",
|
|
@@ -67,6 +68,7 @@
|
|
|
67
68
|
},
|
|
68
69
|
"dependencies": {
|
|
69
70
|
"@conventional-commits/parser": "^0.4.1",
|
|
71
|
+
"@google-automations/git-file-utils": "^1.1.0",
|
|
70
72
|
"@iarna/toml": "^2.2.5",
|
|
71
73
|
"@lerna/collect-updates": "^4.0.0",
|
|
72
74
|
"@lerna/package": "^4.0.0",
|
package/schemas/config.json
CHANGED
|
@@ -95,6 +95,10 @@
|
|
|
95
95
|
"description": "Customize the release pull request title.",
|
|
96
96
|
"type": "string"
|
|
97
97
|
},
|
|
98
|
+
"pull-request-header": {
|
|
99
|
+
"description": "Customize the release pull request header.",
|
|
100
|
+
"type": "string"
|
|
101
|
+
},
|
|
98
102
|
"separate-pull-requests": {
|
|
99
103
|
"description": "Open a separate release pull request for each component. Defaults to `false`.",
|
|
100
104
|
"type": "boolean"
|
|
@@ -189,6 +193,11 @@
|
|
|
189
193
|
},
|
|
190
194
|
{
|
|
191
195
|
"properties": {
|
|
196
|
+
"$schema": {
|
|
197
|
+
"description": "Path to the release-please manifest config schema",
|
|
198
|
+
"type": "string",
|
|
199
|
+
"format": "uri-reference"
|
|
200
|
+
},
|
|
192
201
|
"packages": {
|
|
193
202
|
"description": "Per-path component configuration.",
|
|
194
203
|
"type": "object",
|
|
@@ -297,6 +306,7 @@
|
|
|
297
306
|
}
|
|
298
307
|
],
|
|
299
308
|
"properties": {
|
|
309
|
+
"$schema": true,
|
|
300
310
|
"packages": true,
|
|
301
311
|
"bootstrap-sha": true,
|
|
302
312
|
"last-release-sha": true,
|
|
@@ -323,6 +333,7 @@
|
|
|
323
333
|
"changelog-type": true,
|
|
324
334
|
"changelog-host": true,
|
|
325
335
|
"pull-request-title-pattern": true,
|
|
336
|
+
"pull-request-header": true,
|
|
326
337
|
"separate-pull-requests": true,
|
|
327
338
|
"tag-separator": true,
|
|
328
339
|
"extra-files": true,
|
|
@@ -1,104 +0,0 @@
|
|
|
1
|
-
import { Octokit } from '@octokit/rest';
|
|
2
|
-
import { Repository } from '../repository';
|
|
3
|
-
export declare const DEFAULT_FILE_MODE = "100644";
|
|
4
|
-
export interface GitHubFileContents {
|
|
5
|
-
sha: string;
|
|
6
|
-
content: string;
|
|
7
|
-
parsedContent: string;
|
|
8
|
-
mode: string;
|
|
9
|
-
}
|
|
10
|
-
/**
|
|
11
|
-
* This class is a read-through cache aimed at minimizing the
|
|
12
|
-
* number of API requests needed to fetch file data/contents.
|
|
13
|
-
* It lazy-caches data as it reads and will return cached data
|
|
14
|
-
* for resources already fetched.
|
|
15
|
-
*/
|
|
16
|
-
export declare class RepositoryFileCache {
|
|
17
|
-
private octokit;
|
|
18
|
-
private repository;
|
|
19
|
-
private cache;
|
|
20
|
-
/**
|
|
21
|
-
* Instantiate a new loading cache instance
|
|
22
|
-
*
|
|
23
|
-
* @param {Octokit} octokit An authenticated octokit instance
|
|
24
|
-
* @param {Repository} repository The repository we are fetching data for
|
|
25
|
-
*/
|
|
26
|
-
constructor(octokit: Octokit, repository: Repository);
|
|
27
|
-
/**
|
|
28
|
-
* Fetch file contents for given path on a given branch. If the
|
|
29
|
-
* data has already been fetched, return a cached copy.
|
|
30
|
-
*
|
|
31
|
-
* @param {string} path Path to the file
|
|
32
|
-
* @param {string} branch Branch to fetch the file from
|
|
33
|
-
* @returns {GitHubFileContents} The file contents
|
|
34
|
-
*/
|
|
35
|
-
getFileContents(path: string, branch: string): Promise<GitHubFileContents>;
|
|
36
|
-
}
|
|
37
|
-
/**
|
|
38
|
-
* This class is a read-through cache for a single branch aimed
|
|
39
|
-
* at minimizing the number of API requests needed to fetch file
|
|
40
|
-
* data/contents. It lazy-caches data as it reads and will return
|
|
41
|
-
* cached data for resources already fetched.
|
|
42
|
-
*/
|
|
43
|
-
export declare class BranchFileCache {
|
|
44
|
-
private octokit;
|
|
45
|
-
private repository;
|
|
46
|
-
private branch;
|
|
47
|
-
private cache;
|
|
48
|
-
private treeCache;
|
|
49
|
-
private treeEntries?;
|
|
50
|
-
/**
|
|
51
|
-
* Instantiate a new loading cache instance
|
|
52
|
-
*
|
|
53
|
-
* @param {Octokit} octokit An authenticated octokit instance
|
|
54
|
-
* @param {Repository} repository The repository we are fetching data for
|
|
55
|
-
* @param {string} branch The branch we are fetching data from
|
|
56
|
-
*/
|
|
57
|
-
constructor(octokit: Octokit, repository: Repository, branch: string);
|
|
58
|
-
/**
|
|
59
|
-
* Fetch file contents for given path. If the data has already been
|
|
60
|
-
* fetched, return the cached copy.
|
|
61
|
-
*
|
|
62
|
-
* @param {string} path Path to the file
|
|
63
|
-
* @param {string} branch Branch to fetch the file from
|
|
64
|
-
* @returns {GitHubFileContents} The file contents
|
|
65
|
-
*/
|
|
66
|
-
getFileContents(path: string): Promise<GitHubFileContents>;
|
|
67
|
-
/**
|
|
68
|
-
* Actually fetch the file contents. Uses the tree API to fetch file
|
|
69
|
-
* data.
|
|
70
|
-
*
|
|
71
|
-
* @param {string} path Path to the file
|
|
72
|
-
*/
|
|
73
|
-
private fetchFileContents;
|
|
74
|
-
/**
|
|
75
|
-
* Return the full recursive git tree. If already fetched, return
|
|
76
|
-
* the cached version. If the tree is too big, return null.
|
|
77
|
-
*
|
|
78
|
-
* @returns {TreeEntry[]} The tree entries
|
|
79
|
-
*/
|
|
80
|
-
private getFullTree;
|
|
81
|
-
/**
|
|
82
|
-
* Returns the git tree for a given SHA. If already fetched, return
|
|
83
|
-
* the cached version.
|
|
84
|
-
*
|
|
85
|
-
* @param {string} sha The tree SHA
|
|
86
|
-
* @returns {TreeEntry[]} The tree entries
|
|
87
|
-
*/
|
|
88
|
-
private getTree;
|
|
89
|
-
/**
|
|
90
|
-
* Fetch the git tree via the GitHub API
|
|
91
|
-
*
|
|
92
|
-
* @param {string} sha The tree SHA
|
|
93
|
-
* @returns {TreeEntry[]} The tree entries
|
|
94
|
-
*/
|
|
95
|
-
private fetchTree;
|
|
96
|
-
/**
|
|
97
|
-
* Fetch the git blob from the GitHub API and convert into a
|
|
98
|
-
* GitHubFileContents object.
|
|
99
|
-
*
|
|
100
|
-
* @param {string} blobSha The git blob SHA
|
|
101
|
-
* @param {TreeEntry} treeEntry The associated tree object
|
|
102
|
-
*/
|
|
103
|
-
private fetchContents;
|
|
104
|
-
}
|
|
@@ -1,208 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// Copyright 2022 Google LLC
|
|
3
|
-
//
|
|
4
|
-
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
5
|
-
// you may not use this file except in compliance with the License.
|
|
6
|
-
// You may obtain a copy of the License at
|
|
7
|
-
//
|
|
8
|
-
// http://www.apache.org/licenses/LICENSE-2.0
|
|
9
|
-
//
|
|
10
|
-
// Unless required by applicable law or agreed to in writing, software
|
|
11
|
-
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
12
|
-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
13
|
-
// See the License for the specific language governing permissions and
|
|
14
|
-
// limitations under the License.
|
|
15
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.BranchFileCache = exports.RepositoryFileCache = exports.DEFAULT_FILE_MODE = void 0;
|
|
17
|
-
const logger_1 = require("./logger");
|
|
18
|
-
const errors_1 = require("../errors");
|
|
19
|
-
exports.DEFAULT_FILE_MODE = '100644';
|
|
20
|
-
/**
|
|
21
|
-
* This class is a read-through cache aimed at minimizing the
|
|
22
|
-
* number of API requests needed to fetch file data/contents.
|
|
23
|
-
* It lazy-caches data as it reads and will return cached data
|
|
24
|
-
* for resources already fetched.
|
|
25
|
-
*/
|
|
26
|
-
class RepositoryFileCache {
|
|
27
|
-
/**
|
|
28
|
-
* Instantiate a new loading cache instance
|
|
29
|
-
*
|
|
30
|
-
* @param {Octokit} octokit An authenticated octokit instance
|
|
31
|
-
* @param {Repository} repository The repository we are fetching data for
|
|
32
|
-
*/
|
|
33
|
-
constructor(octokit, repository) {
|
|
34
|
-
this.octokit = octokit;
|
|
35
|
-
this.repository = repository;
|
|
36
|
-
this.cache = new Map();
|
|
37
|
-
}
|
|
38
|
-
/**
|
|
39
|
-
* Fetch file contents for given path on a given branch. If the
|
|
40
|
-
* data has already been fetched, return a cached copy.
|
|
41
|
-
*
|
|
42
|
-
* @param {string} path Path to the file
|
|
43
|
-
* @param {string} branch Branch to fetch the file from
|
|
44
|
-
* @returns {GitHubFileContents} The file contents
|
|
45
|
-
*/
|
|
46
|
-
async getFileContents(path, branch) {
|
|
47
|
-
let fileCache = this.cache.get(branch);
|
|
48
|
-
if (!fileCache) {
|
|
49
|
-
fileCache = new BranchFileCache(this.octokit, this.repository, branch);
|
|
50
|
-
this.cache.set(branch, fileCache);
|
|
51
|
-
}
|
|
52
|
-
return await fileCache.getFileContents(path);
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
exports.RepositoryFileCache = RepositoryFileCache;
|
|
56
|
-
/**
|
|
57
|
-
* This class is a read-through cache for a single branch aimed
|
|
58
|
-
* at minimizing the number of API requests needed to fetch file
|
|
59
|
-
* data/contents. It lazy-caches data as it reads and will return
|
|
60
|
-
* cached data for resources already fetched.
|
|
61
|
-
*/
|
|
62
|
-
class BranchFileCache {
|
|
63
|
-
/**
|
|
64
|
-
* Instantiate a new loading cache instance
|
|
65
|
-
*
|
|
66
|
-
* @param {Octokit} octokit An authenticated octokit instance
|
|
67
|
-
* @param {Repository} repository The repository we are fetching data for
|
|
68
|
-
* @param {string} branch The branch we are fetching data from
|
|
69
|
-
*/
|
|
70
|
-
constructor(octokit, repository, branch) {
|
|
71
|
-
this.octokit = octokit;
|
|
72
|
-
this.repository = repository;
|
|
73
|
-
this.branch = branch;
|
|
74
|
-
this.cache = new Map();
|
|
75
|
-
this.treeCache = new Map();
|
|
76
|
-
}
|
|
77
|
-
/**
|
|
78
|
-
* Fetch file contents for given path. If the data has already been
|
|
79
|
-
* fetched, return the cached copy.
|
|
80
|
-
*
|
|
81
|
-
* @param {string} path Path to the file
|
|
82
|
-
* @param {string} branch Branch to fetch the file from
|
|
83
|
-
* @returns {GitHubFileContents} The file contents
|
|
84
|
-
*/
|
|
85
|
-
async getFileContents(path) {
|
|
86
|
-
const cached = this.cache.get(path);
|
|
87
|
-
if (cached) {
|
|
88
|
-
return cached;
|
|
89
|
-
}
|
|
90
|
-
const fetched = await this.fetchFileContents(path);
|
|
91
|
-
this.cache.set(path, fetched);
|
|
92
|
-
return fetched;
|
|
93
|
-
}
|
|
94
|
-
/**
|
|
95
|
-
* Actually fetch the file contents. Uses the tree API to fetch file
|
|
96
|
-
* data.
|
|
97
|
-
*
|
|
98
|
-
* @param {string} path Path to the file
|
|
99
|
-
*/
|
|
100
|
-
async fetchFileContents(path) {
|
|
101
|
-
// try to use the entire git tree if it's not too big
|
|
102
|
-
const treeEntries = await this.getFullTree();
|
|
103
|
-
if (treeEntries) {
|
|
104
|
-
logger_1.logger.debug(`Using full tree to find ${path}`);
|
|
105
|
-
const found = treeEntries.find(entry => entry.path === path);
|
|
106
|
-
if (found === null || found === void 0 ? void 0 : found.sha) {
|
|
107
|
-
return await this.fetchContents(found.sha, found);
|
|
108
|
-
}
|
|
109
|
-
throw new errors_1.FileNotFoundError(path);
|
|
110
|
-
}
|
|
111
|
-
// full tree is too big, use data API to fetch
|
|
112
|
-
const parts = path.split('/');
|
|
113
|
-
let treeSha = this.branch;
|
|
114
|
-
let found;
|
|
115
|
-
for (const part of parts) {
|
|
116
|
-
const tree = await this.getTree(treeSha);
|
|
117
|
-
found = tree.find(item => item.path === part);
|
|
118
|
-
if (!(found === null || found === void 0 ? void 0 : found.sha)) {
|
|
119
|
-
throw new errors_1.FileNotFoundError(path);
|
|
120
|
-
}
|
|
121
|
-
treeSha = found.sha;
|
|
122
|
-
}
|
|
123
|
-
if (found === null || found === void 0 ? void 0 : found.sha) {
|
|
124
|
-
return await this.fetchContents(found.sha, found);
|
|
125
|
-
}
|
|
126
|
-
throw new errors_1.FileNotFoundError(path);
|
|
127
|
-
}
|
|
128
|
-
/**
|
|
129
|
-
* Return the full recursive git tree. If already fetched, return
|
|
130
|
-
* the cached version. If the tree is too big, return null.
|
|
131
|
-
*
|
|
132
|
-
* @returns {TreeEntry[]} The tree entries
|
|
133
|
-
*/
|
|
134
|
-
async getFullTree() {
|
|
135
|
-
if (this.treeEntries === undefined) {
|
|
136
|
-
// fetch all tree entries recursively
|
|
137
|
-
const { data: { tree, truncated }, } = await this.octokit.git.getTree({
|
|
138
|
-
owner: this.repository.owner,
|
|
139
|
-
repo: this.repository.repo,
|
|
140
|
-
tree_sha: this.branch,
|
|
141
|
-
recursive: 'true',
|
|
142
|
-
});
|
|
143
|
-
if (truncated) {
|
|
144
|
-
// the full tree is too big to use, mark it as unusable
|
|
145
|
-
this.treeEntries = null;
|
|
146
|
-
}
|
|
147
|
-
else {
|
|
148
|
-
this.treeEntries = tree;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
return this.treeEntries;
|
|
152
|
-
}
|
|
153
|
-
/**
|
|
154
|
-
* Returns the git tree for a given SHA. If already fetched, return
|
|
155
|
-
* the cached version.
|
|
156
|
-
*
|
|
157
|
-
* @param {string} sha The tree SHA
|
|
158
|
-
* @returns {TreeEntry[]} The tree entries
|
|
159
|
-
*/
|
|
160
|
-
async getTree(sha) {
|
|
161
|
-
const cached = this.treeCache.get(sha);
|
|
162
|
-
if (cached) {
|
|
163
|
-
return cached;
|
|
164
|
-
}
|
|
165
|
-
const fetched = await this.fetchTree(sha);
|
|
166
|
-
this.treeCache.set(sha, fetched);
|
|
167
|
-
return fetched;
|
|
168
|
-
}
|
|
169
|
-
/**
|
|
170
|
-
* Fetch the git tree via the GitHub API
|
|
171
|
-
*
|
|
172
|
-
* @param {string} sha The tree SHA
|
|
173
|
-
* @returns {TreeEntry[]} The tree entries
|
|
174
|
-
*/
|
|
175
|
-
async fetchTree(sha) {
|
|
176
|
-
const { data: { tree, truncated }, } = await this.octokit.git.getTree({
|
|
177
|
-
owner: this.repository.owner,
|
|
178
|
-
repo: this.repository.repo,
|
|
179
|
-
tree_sha: sha,
|
|
180
|
-
});
|
|
181
|
-
if (truncated) {
|
|
182
|
-
logger_1.logger.warn(`file list for tree sha ${sha} is truncated`);
|
|
183
|
-
}
|
|
184
|
-
return tree;
|
|
185
|
-
}
|
|
186
|
-
/**
|
|
187
|
-
* Fetch the git blob from the GitHub API and convert into a
|
|
188
|
-
* GitHubFileContents object.
|
|
189
|
-
*
|
|
190
|
-
* @param {string} blobSha The git blob SHA
|
|
191
|
-
* @param {TreeEntry} treeEntry The associated tree object
|
|
192
|
-
*/
|
|
193
|
-
async fetchContents(blobSha, treeEntry) {
|
|
194
|
-
const { data: { content }, } = await this.octokit.git.getBlob({
|
|
195
|
-
owner: this.repository.owner,
|
|
196
|
-
repo: this.repository.repo,
|
|
197
|
-
file_sha: blobSha,
|
|
198
|
-
});
|
|
199
|
-
return {
|
|
200
|
-
sha: blobSha,
|
|
201
|
-
mode: treeEntry.mode || exports.DEFAULT_FILE_MODE,
|
|
202
|
-
content,
|
|
203
|
-
parsedContent: Buffer.from(content, 'base64').toString('utf8'),
|
|
204
|
-
};
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
exports.BranchFileCache = BranchFileCache;
|
|
208
|
-
//# sourceMappingURL=file-cache.js.map
|