Skip to content

Commit 797e352

Browse files
Merge branch 'develop' into es-aggregate-error
2 parents 44e2f35 + c89ee5c commit 797e352

4 files changed

Lines changed: 63 additions & 66 deletions

File tree

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
diff --git a/node_modules/@semantic-release/github/index.js b/node_modules/@semantic-release/github/index.js
2+
index 2d1aa8b8..8d383a4b 100644
3+
--- a/node_modules/@semantic-release/github/index.js
4+
+++ b/node_modules/@semantic-release/github/index.js
5+
@@ -4,7 +4,6 @@ import { defaultTo, castArray } from "lodash-es";
6+
7+
import verifyGitHub from "./lib/verify.js";
8+
import addChannelGitHub from "./lib/add-channel.js";
9+
-import publishGitHub from "./lib/publish.js";
10+
import successGitHub from "./lib/success.js";
11+
import failGitHub from "./lib/fail.js";
12+
import { SemanticReleaseOctokit } from "./lib/octokit.js";
13+
@@ -52,19 +51,6 @@ export async function verifyConditions(
14+
verified = true;
15+
}
16+
17+
-export async function publish(
18+
- pluginConfig,
19+
- context,
20+
- { Octokit = SemanticReleaseOctokit } = {},
21+
-) {
22+
- if (!verified) {
23+
- await verifyGitHub(pluginConfig, context, { Octokit });
24+
- verified = true;
25+
- }
26+
-
27+
- return publishGitHub(pluginConfig, context, { Octokit });
28+
-}
29+
-
30+
export async function addChannel(
31+
pluginConfig,
32+
context,
33+
diff --git a/node_modules/@semantic-release/github/lib/success.js b/node_modules/@semantic-release/github/lib/success.js
34+
index 48246f29..0aa0a549 100644
35+
--- a/node_modules/@semantic-release/github/lib/success.js
36+
+++ b/node_modules/@semantic-release/github/lib/success.js
37+
@@ -16,7 +16,7 @@ const debug = debugFactory("semantic-release:github");
38+
39+
export default async function success(pluginConfig, context, { Octokit }) {
40+
const {
41+
- options: { repositoryUrl },
42+
+ options: { repositoryUrl, tagFormat },
43+
commits,
44+
nextRelease,
45+
releases,
46+
@@ -73,7 +73,9 @@ export default async function success(pluginConfig, context, { Octokit }) {
47+
githubUrl ? { hosts: [githubUrl] } : {},
48+
);
49+
const releaseInfos = releases.filter((release) => Boolean(release.name));
50+
- const shas = commits.map(({ hash }) => hash);
51+
+ const pkgName = tagFormat.replace('@stoplight/spectral-', '').replace('-${version}', '');
52+
+ const pkgNameRegexp = RegExp(`^[a-z]+\\(${pkgName}\\):`);
53+
+ const shas = commits.filter(({ subject }) => pkgNameRegexp.test(subject)).map(({ hash }) => hash);
54+
55+
// Get associatedPRs
56+
const associatedPRs = await inChunks(shas, 100, async (chunk) => {

patches/@semantic-release+github+8.1.0.patch

Lines changed: 0 additions & 59 deletions
This file was deleted.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/node_modules/multi-semantic-release/lib/multiSemanticRelease.js b/node_modules/multi-semantic-release/lib/multiSemanticRelease.js
2-
index 912a363..e651119 100644
2+
index 4629a929..e097678b 100644
33
--- a/node_modules/multi-semantic-release/lib/multiSemanticRelease.js
44
+++ b/node_modules/multi-semantic-release/lib/multiSemanticRelease.js
55
@@ -191,7 +191,7 @@ async function releasePackage(pkg, createInlinePlugin, multiContext, flags) {
@@ -8,6 +8,6 @@ index 912a363..e651119 100644
88
// It'd also be difficult to merge all the assets into one release without full editing/overriding the plugins.
99
- options.tagFormat = name + "@${version}";
1010
+ options.tagFormat = name + "-${version}";
11-
12-
// This options are needed for plugins that do not rely on `pluginOptions` and extract them independently.
13-
options._pkgOptions = pkgOptions;
11+
12+
// These options are needed for plugins that do not rely on `pluginOptions` and extract them independently.
13+
options._pkgOptions = pkgOptions;

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7487,9 +7487,9 @@ __metadata:
74877487
linkType: hard
74887488

74897489
"flatted@npm:^3.1.0, flatted@npm:^3.2.5":
7490-
version: 3.2.6
7491-
resolution: "flatted@npm:3.2.6"
7492-
checksum: 33b87aa88dfa40ca6ee31d7df61712bbbad3d3c05c132c23e59b9b61d34631b337a18ff2b8dc5553acdc871ec72b741e485f78969cf006124a3f57174de29a0e
7490+
version: 3.4.2
7491+
resolution: "flatted@npm:3.4.2"
7492+
checksum: 1b2536fccbbf75d67a823dea67819f764c19266ad5e4aca6b47f6bf84d3b5e1c15eb5862f7dec1fb87129b60741524933192051286de52baddbc97129896380d
74937493
languageName: node
74947494
linkType: hard
74957495

0 commit comments

Comments
 (0)