From 48f987371f270c6b9dd82948f9ce6e38c469f858 Mon Sep 17 00:00:00 2001 From: Google GitHub Actions Bot <72759630+google-github-actions-bot@users.noreply.github.com> Date: Mon, 11 Sep 2023 14:34:50 -0400 Subject: [PATCH] chore: build dist (#826) Build dist PR --- dist/commit.hbs | 50 ++++++++----------------------- dist/commit1.hbs | 50 +++++++++++++++++++++++-------- dist/footer.hbs | 10 ------- dist/footer1.hbs | 10 +++++++ dist/header.hbs | 18 +++++------ dist/header1.hbs | 18 +++++------ dist/index.js | 74 ++++++++++++++++++++++++++++++++++++++++------ dist/template.hbs | 20 ++++++++++--- dist/template1.hbs | 20 +++---------- 9 files changed, 163 insertions(+), 107 deletions(-) diff --git a/dist/commit.hbs b/dist/commit.hbs index 3b2cd68..641c2f3 100644 --- a/dist/commit.hbs +++ b/dist/commit.hbs @@ -1,20 +1,15 @@ -* {{header}} +*{{#if scope}} **{{scope}}:** +{{~/if}} {{#if subject}} + {{~subject}} +{{~else}} + {{~header}} +{{~/if}} -{{~!-- commit link --}} -{{~#if @root.linkReferences}} ([{{hash}}]( - {{~#if @root.repository}} - {{~#if @root.host}} - {{~@root.host}}/ - {{~/if}} - {{~#if @root.owner}} - {{~@root.owner}}/ - {{~/if}} - {{~@root.repository}} - {{~else}} - {{~@root.repoUrl}} - {{~/if}}/ - {{~@root.commit}}/{{hash}})) -{{~else if hash}} {{hash}}{{~/if}} +{{~!-- commit link --}}{{~#if hash}} {{#if @root.linkReferences~}} + ([{{shortHash}}]({{commitUrlFormat}})) +{{~else}} + {{~shortHash}} +{{~/if}}{{~/if}} {{~!-- commit references --}} {{~#if references~}} @@ -24,31 +19,12 @@ {{~#if this.owner}} {{~this.owner}}/ {{~/if}} - {{~this.repository}}#{{this.issue}}]( - {{~#if @root.repository}} - {{~#if @root.host}} - {{~@root.host}}/ - {{~/if}} - {{~#if this.repository}} - {{~#if this.owner}} - {{~this.owner}}/ - {{~/if}} - {{~this.repository}} - {{~else}} - {{~#if @root.owner}} - {{~@root.owner}}/ - {{~/if}} - {{~@root.repository}} - {{~/if}} - {{~else}} - {{~@root.repoUrl}} - {{~/if}}/ - {{~@root.issue}}/{{this.issue}}) + {{~this.repository}}{{this.prefix}}{{this.issue}}]({{issueUrlFormat}}) {{~else}} {{~#if this.owner}} {{~this.owner}}/ {{~/if}} - {{~this.repository}}#{{this.issue}} + {{~this.repository}}{{this.prefix}}{{this.issue}} {{~/if}}{{/each}} {{~/if}} diff --git a/dist/commit1.hbs b/dist/commit1.hbs index 641c2f3..3b2cd68 100644 --- a/dist/commit1.hbs +++ b/dist/commit1.hbs @@ -1,15 +1,20 @@ -*{{#if scope}} **{{scope}}:** -{{~/if}} {{#if subject}} - {{~subject}} -{{~else}} - {{~header}} -{{~/if}} +* {{header}} -{{~!-- commit link --}}{{~#if hash}} {{#if @root.linkReferences~}} - ([{{shortHash}}]({{commitUrlFormat}})) -{{~else}} - {{~shortHash}} -{{~/if}}{{~/if}} +{{~!-- commit link --}} +{{~#if @root.linkReferences}} ([{{hash}}]( + {{~#if @root.repository}} + {{~#if @root.host}} + {{~@root.host}}/ + {{~/if}} + {{~#if @root.owner}} + {{~@root.owner}}/ + {{~/if}} + {{~@root.repository}} + {{~else}} + {{~@root.repoUrl}} + {{~/if}}/ + {{~@root.commit}}/{{hash}})) +{{~else if hash}} {{hash}}{{~/if}} {{~!-- commit references --}} {{~#if references~}} @@ -19,12 +24,31 @@ {{~#if this.owner}} {{~this.owner}}/ {{~/if}} - {{~this.repository}}{{this.prefix}}{{this.issue}}]({{issueUrlFormat}}) + {{~this.repository}}#{{this.issue}}]( + {{~#if @root.repository}} + {{~#if @root.host}} + {{~@root.host}}/ + {{~/if}} + {{~#if this.repository}} + {{~#if this.owner}} + {{~this.owner}}/ + {{~/if}} + {{~this.repository}} + {{~else}} + {{~#if @root.owner}} + {{~@root.owner}}/ + {{~/if}} + {{~@root.repository}} + {{~/if}} + {{~else}} + {{~@root.repoUrl}} + {{~/if}}/ + {{~@root.issue}}/{{this.issue}}) {{~else}} {{~#if this.owner}} {{~this.owner}}/ {{~/if}} - {{~this.repository}}{{this.prefix}}{{this.issue}} + {{~this.repository}}#{{this.issue}} {{~/if}}{{/each}} {{~/if}} diff --git a/dist/footer.hbs b/dist/footer.hbs index dca482f..e69de29 100644 --- a/dist/footer.hbs +++ b/dist/footer.hbs @@ -1,10 +0,0 @@ -{{#if noteGroups}} -{{#each noteGroups}} - -### {{title}} - -{{#each notes}} -* {{text}} -{{/each}} -{{/each}} -{{/if}} diff --git a/dist/footer1.hbs b/dist/footer1.hbs index e69de29..dca482f 100644 --- a/dist/footer1.hbs +++ b/dist/footer1.hbs @@ -0,0 +1,10 @@ +{{#if noteGroups}} +{{#each noteGroups}} + +### {{title}} + +{{#each notes}} +* {{text}} +{{/each}} +{{/each}} +{{/if}} diff --git a/dist/header.hbs b/dist/header.hbs index 49f5607..d7efc8f 100644 --- a/dist/header.hbs +++ b/dist/header.hbs @@ -1,9 +1,9 @@ -## {{#if isPatch~}} - {{~/if~}} {{version}} - {{~#if title}} "{{title}}" - {{~/if~}} - {{~#if date}} ({{date}}) - {{~/if~}} - {{~#if isPatch~}} - {{~/if}} - +## {{#if @root.linkCompare~}} + [{{version}}]({{compareUrlFormat}}) +{{~else}} + {{~version}} +{{~/if}} +{{~#if title}} "{{title}}" +{{~/if}} +{{~#if date}} ({{date}}) +{{/if}} diff --git a/dist/header1.hbs b/dist/header1.hbs index d7efc8f..49f5607 100644 --- a/dist/header1.hbs +++ b/dist/header1.hbs @@ -1,9 +1,9 @@ -## {{#if @root.linkCompare~}} - [{{version}}]({{compareUrlFormat}}) -{{~else}} - {{~version}} -{{~/if}} -{{~#if title}} "{{title}}" -{{~/if}} -{{~#if date}} ({{date}}) -{{/if}} +## {{#if isPatch~}} + {{~/if~}} {{version}} + {{~#if title}} "{{title}}" + {{~/if~}} + {{~#if date}} ({{date}}) + {{~/if~}} + {{~#if isPatch~}} + {{~/if}} + diff --git a/dist/index.js b/dist/index.js index 43617fc..40da181 100644 --- a/dist/index.js +++ b/dist/index.js @@ -25192,10 +25192,10 @@ module.exports = async (config) => { commit, footer ] = await Promise.all([ - readFile(__nccwpck_require__.ab + "template1.hbs", 'utf-8'), - readFile(__nccwpck_require__.ab + "header1.hbs", 'utf-8'), - readFile(__nccwpck_require__.ab + "commit1.hbs", 'utf-8'), - readFile(__nccwpck_require__.ab + "footer1.hbs", 'utf-8') + readFile(__nccwpck_require__.ab + "template.hbs", 'utf-8'), + readFile(__nccwpck_require__.ab + "header.hbs", 'utf-8'), + readFile(__nccwpck_require__.ab + "commit.hbs", 'utf-8'), + readFile(__nccwpck_require__.ab + "footer.hbs", 'utf-8') ]) const writerOpts = getWriterOpts(config) @@ -25409,10 +25409,10 @@ function conventionalChangelogWriterInit (context, options) { includeDetails: false, ignoreReverted: true, doFlush: true, - mainTemplate: readFileSync(__nccwpck_require__.ab + "template.hbs", 'utf-8'), - headerPartial: readFileSync(__nccwpck_require__.ab + "header.hbs", 'utf-8'), - commitPartial: readFileSync(__nccwpck_require__.ab + "commit.hbs", 'utf-8'), - footerPartial: readFileSync(__nccwpck_require__.ab + "footer.hbs", 'utf-8'), + mainTemplate: readFileSync(__nccwpck_require__.ab + "template1.hbs", 'utf-8'), + headerPartial: readFileSync(__nccwpck_require__.ab + "header1.hbs", 'utf-8'), + commitPartial: readFileSync(__nccwpck_require__.ab + "commit1.hbs", 'utf-8'), + footerPartial: readFileSync(__nccwpck_require__.ab + "footer1.hbs", 'utf-8'), ...options } @@ -76972,6 +76972,7 @@ const changelog_1 = __nccwpck_require__(3325); // Terraform specific. const readme_1 = __nccwpck_require__(4996); const module_version_1 = __nccwpck_require__(19696); +const metadata_version_1 = __nccwpck_require__(54957); const base_1 = __nccwpck_require__(95081); const version_1 = __nccwpck_require__(17348); class TerraformModule extends base_1.BaseStrategy { @@ -77020,6 +77021,17 @@ class TerraformModule extends base_1.BaseStrategy { }), }); }); + // Update metadata.yaml to current candidate version. + const metadataFiles = await this.github.findFilesByFilenameAndRef('metadata.yaml', this.targetBranch, this.path); + metadataFiles.forEach(path => { + updates.push({ + path: this.addPath(path), + createIfMissing: false, + updater: new metadata_version_1.MetadataVersion({ + version, + }), + }); + }); return updates; } initialReleaseVersion() { @@ -79523,6 +79535,50 @@ exports.SfdxProjectJson = SfdxProjectJson; /***/ }), +/***/ 54957: +/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { + +"use strict"; + +// Copyright 2023 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +Object.defineProperty(exports, "__esModule", ({ value: true })); +exports.MetadataVersion = void 0; +const logger_1 = __nccwpck_require__(68809); +const default_1 = __nccwpck_require__(69995); +/** + * Updates a Terraform metadata.yaml or metadata.display.yaml file(s). + */ +class MetadataVersion extends default_1.DefaultUpdater { + /** + * Given initial file contents, return updated contents. + * @param {string} content The initial content + * @returns {string} The updated content + */ + updateContent(content, logger = logger_1.logger) { + const oldVersion = content.match(/version: [0-9]+\.[0-9]+\.[0-9]+(-\w+)?/); + if (oldVersion) { + logger.info(`updating from ${oldVersion} to v${this.version}`); + } + return content.replace(/version: [0-9]+\.[0-9]+\.[0-9]+(-\w+)?/g, `version: ${this.version}`); + } +} +exports.MetadataVersion = MetadataVersion; +//# sourceMappingURL=metadata-version.js.map + +/***/ }), + /***/ 19696: /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => { @@ -109795,7 +109851,7 @@ module.exports = {}; /***/ ((module) => { "use strict"; -module.exports = {"i8":"15.12.0"}; +module.exports = {"i8":"15.13.0"}; /***/ }), diff --git a/dist/template.hbs b/dist/template.hbs index 2c1349a..3b194f0 100644 --- a/dist/template.hbs +++ b/dist/template.hbs @@ -1,11 +1,23 @@ {{> header}} +{{#if noteGroups}} +{{#each noteGroups}} + +### ⚠ {{title}} + +{{#each notes}} +* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}} +{{/each}} +{{/each}} +{{/if}} {{#each commitGroups}} + +{{#if title}} +### {{title}} + +{{/if}} {{#each commits}} {{> commit root=@root}} {{/each}} + {{/each}} - -{{> footer}} - - diff --git a/dist/template1.hbs b/dist/template1.hbs index 3b194f0..2c1349a 100644 --- a/dist/template1.hbs +++ b/dist/template1.hbs @@ -1,23 +1,11 @@ {{> header}} -{{#if noteGroups}} -{{#each noteGroups}} - -### ⚠ {{title}} - -{{#each notes}} -* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}} -{{/each}} -{{/each}} -{{/if}} {{#each commitGroups}} - -{{#if title}} -### {{title}} - -{{/if}} {{#each commits}} {{> commit root=@root}} {{/each}} - {{/each}} + +{{> footer}} + +