Skip to content

Commit 6c1a882

Browse files
ci: fix release comments for issues and pull requests (#4940)
1 parent 4f42717 commit 6c1a882

File tree

4 files changed

+48
-35
lines changed

4 files changed

+48
-35
lines changed

.github/createIssueCommentsForRelease.mjs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const commitShaRegExp = /commit\/(?<sha>\w{40})/gm;
1313
export default async function run({ github, context }) {
1414
const { version } = JSON.parse(readFileSync(new URL('../lerna.json', import.meta.url)).toString());
1515

16-
const { data: release } = await github.repos.getReleaseByTag({
16+
const { data: release } = await github.request('GET /repos/{owner}/{repo}/releases/tags/{tag}', {
1717
owner: context.repo.owner,
1818
repo: context.repo.repo,
1919
tag: `v${version}`
@@ -43,5 +43,11 @@ export default async function run({ github, context }) {
4343
env: process.env
4444
};
4545

46-
await issueCommenter({}, semanticReleaseContext);
46+
const Octokit = new Proxy(class {}, {
47+
construct(target, argArray, newTarget) {
48+
return github;
49+
}
50+
});
51+
52+
await issueCommenter({}, semanticReleaseContext, { Octokit });
4753
}

.github/workflows/release-comments.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ jobs:
1414
- name: Setup Node.js environment
1515
uses: actions/[email protected]
1616
with:
17-
node-version: 16
17+
node-version-file: '.nvmrc'
1818
cache: 'yarn'
1919

2020
- name: Install Dependencies
2121
run: |
2222
yarn install --immutable
23-
yarn add @octokit/[email protected] @octokit/[email protected]
23+
env:
24+
CYPRESS_INSTALL_BINARY: 0
2425

2526
### Semantic Release Bot comments for issues and PRs ###
2627
- name: Add release comments to issues and PRs
2728
uses: actions/github-script@v6
2829
env:
2930
GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}
3031
with:
31-
node-version: 16
3232
script: |
3333
const { default: addIssueComments } = await import('${{ github.workspace }}/.github/createIssueCommentsForRelease.mjs');
3434
35-
await addIssueComments({ github: github.rest, context })
35+
await addIssueComments({ github, context })

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@ jobs:
6666
script: |
6767
const { default: addIssueComments } = await import('${{ github.workspace }}/.github/createIssueCommentsForRelease.mjs');
6868
69-
await addIssueComments({ github: github.rest, context })
69+
await addIssueComments({ github, context })
7070

yarn.lock

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2876,11 +2876,9 @@ __metadata:
28762876
linkType: hard
28772877

28782878
"@octokit/auth-token@npm:^3.0.0":
2879-
version: 3.0.3
2880-
resolution: "@octokit/auth-token@npm:3.0.3"
2881-
dependencies:
2882-
"@octokit/types": ^9.0.0
2883-
checksum: 9b3f569cec1b7e0aa88ab6da68aed4b49b6652261bd957257541fabaf6a4d4ed99f908153cc3dd2fe15b8b0ccaff8caaafaa50bb1a4de3925b0954a47cca1900
2879+
version: 3.0.4
2880+
resolution: "@octokit/auth-token@npm:3.0.4"
2881+
checksum: 42f533a873d4192e6df406b3176141c1f95287423ebdc4cf23a38bb77ee00ccbc0e60e3fbd5874234fc2ed2e67bbc6035e3b0561dacc1d078adb5c4ced3579e3
28842882
languageName: node
28852883
linkType: hard
28862884

@@ -2892,8 +2890,8 @@ __metadata:
28922890
linkType: hard
28932891

28942892
"@octokit/core@npm:^4.2.1":
2895-
version: 4.2.1
2896-
resolution: "@octokit/core@npm:4.2.1"
2893+
version: 4.2.4
2894+
resolution: "@octokit/core@npm:4.2.4"
28972895
dependencies:
28982896
"@octokit/auth-token": ^3.0.0
28992897
"@octokit/graphql": ^5.0.0
@@ -2902,7 +2900,7 @@ __metadata:
29022900
"@octokit/types": ^9.0.0
29032901
before-after-hook: ^2.2.0
29042902
universal-user-agent: ^6.0.0
2905-
checksum: f82d52e937e12da1c7c163341c845b8e27e7fa75678f5e5954e6fa017a94f1833d6e5c4e43f0be796fbfea9dc5e1137087f655dbd5acb3d57879e1b28568e0a9
2903+
checksum: ac8ab47440a31b0228a034aacac6994b64d6b073ad5b688b4c5157fc5ee0d1af1c926e6087bf17fd7244ee9c5998839da89065a90819bde4a97cb77d4edf58a6
29062904
languageName: node
29072905
linkType: hard
29082906

@@ -2922,13 +2920,13 @@ __metadata:
29222920
linkType: hard
29232921

29242922
"@octokit/endpoint@npm:^7.0.0":
2925-
version: 7.0.5
2926-
resolution: "@octokit/endpoint@npm:7.0.5"
2923+
version: 7.0.6
2924+
resolution: "@octokit/endpoint@npm:7.0.6"
29272925
dependencies:
29282926
"@octokit/types": ^9.0.0
29292927
is-plain-object: ^5.0.0
29302928
universal-user-agent: ^6.0.0
2931-
checksum: 81c9e9eabf50e48940cceff7c4d7fbc9327190296507cfe8a199ea00cd492caf8f18a841caf4e3619828924b481996eb16091826db6b5a649bee44c8718ecaa9
2929+
checksum: 7caebf30ceec50eb7f253341ed419df355232f03d4638a95c178ee96620400db7e4a5e15d89773fe14db19b8653d4ab4cc81b2e93ca0c760b4e0f7eb7ad80301
29322930
languageName: node
29332931
linkType: hard
29342932

@@ -2944,13 +2942,13 @@ __metadata:
29442942
linkType: hard
29452943

29462944
"@octokit/graphql@npm:^5.0.0":
2947-
version: 5.0.5
2948-
resolution: "@octokit/graphql@npm:5.0.5"
2945+
version: 5.0.6
2946+
resolution: "@octokit/graphql@npm:5.0.6"
29492947
dependencies:
29502948
"@octokit/request": ^6.0.0
29512949
"@octokit/types": ^9.0.0
29522950
universal-user-agent: ^6.0.0
2953-
checksum: eb2d1a6305a3d1f55ff0ce92fb88b677f0bb789757152d58a79ef61171fb65ecf6fe18d6c27e236c0cee6a0c2600c2cb8370f5ac7184f8e9361c085aa4555bb1
2951+
checksum: 7be545d348ef31dcab0a2478dd64d5746419a2f82f61459c774602bcf8a9b577989c18001f50b03f5f61a3d9e34203bdc021a4e4d75ff2d981e8c9c09cf8a65c
29542952
languageName: node
29552953
linkType: hard
29562954

@@ -3012,13 +3010,13 @@ __metadata:
30123010
linkType: hard
30133011

30143012
"@octokit/plugin-rest-endpoint-methods@npm:^7.1.2":
3015-
version: 7.2.1
3016-
resolution: "@octokit/plugin-rest-endpoint-methods@npm:7.2.1"
3013+
version: 7.2.3
3014+
resolution: "@octokit/plugin-rest-endpoint-methods@npm:7.2.3"
30173015
dependencies:
3018-
"@octokit/types": ^9.3.1
3016+
"@octokit/types": ^10.0.0
30193017
peerDependencies:
30203018
"@octokit/core": ">=3"
3021-
checksum: 069e52305f9d2e85fb83819a80860e526b9da2e0936640975f749a2c63020674053e6f4b5af771651a93320172579b0779bf3d663c8adcd090f152aac29f4ad4
3019+
checksum: 21dfb98514dbe900c29cddb13b335bbce43d613800c6b17eba3c1fd31d17e69c1960f3067f7bf864bb38fdd5043391f4a23edee42729d8c7fbabd00569a80336
30223020
languageName: node
30233021
linkType: hard
30243022

@@ -3070,29 +3068,29 @@ __metadata:
30703068
linkType: hard
30713069

30723070
"@octokit/request@npm:^6.0.0":
3073-
version: 6.2.3
3074-
resolution: "@octokit/request@npm:6.2.3"
3071+
version: 6.2.8
3072+
resolution: "@octokit/request@npm:6.2.8"
30753073
dependencies:
30763074
"@octokit/endpoint": ^7.0.0
30773075
"@octokit/request-error": ^3.0.0
30783076
"@octokit/types": ^9.0.0
30793077
is-plain-object: ^5.0.0
30803078
node-fetch: ^2.6.7
30813079
universal-user-agent: ^6.0.0
3082-
checksum: fef4097be8375d20bb0b3276d8a3adf866ec628f2b0664d334f3c29b92157da847899497abdc7a5be540053819b55564990543175ad48f04e9e6f25f0395d4d3
3080+
checksum: 3747106f50d7c462131ff995b13defdd78024b7becc40283f4ac9ea0af2391ff33a0bb476a05aa710346fe766d20254979079a1d6f626112015ba271fe38f3e2
30833081
languageName: node
30843082
linkType: hard
30853083

30863084
"@octokit/request@npm:^8.0.1, @octokit/request@npm:^8.0.2":
3087-
version: 8.1.0
3088-
resolution: "@octokit/request@npm:8.1.0"
3085+
version: 8.1.1
3086+
resolution: "@octokit/request@npm:8.1.1"
30893087
dependencies:
30903088
"@octokit/endpoint": ^9.0.0
30913089
"@octokit/request-error": ^5.0.0
30923090
"@octokit/types": ^11.1.0
30933091
is-plain-object: ^5.0.0
30943092
universal-user-agent: ^6.0.0
3095-
checksum: 00f71e1ca0bff84a1a903ca9f79a7837aac830cae3560d44f03272d062ef98e5a8170fdab8a47169c41db88e6894717cc71387604486d559f9eae409fab93f6f
3093+
checksum: dec3ba2cba14739159cd8d1653ad8ac6d58095e4ac294d312d20ce2c63c60c3cad2e5499137244dba3d681fd5cd7f74b4b5d4df024a19c0ee1831204e5a3a894
30963094
languageName: node
30973095
linkType: hard
30983096

@@ -3115,6 +3113,15 @@ __metadata:
31153113
languageName: node
31163114
linkType: hard
31173115

3116+
"@octokit/types@npm:^10.0.0":
3117+
version: 10.0.0
3118+
resolution: "@octokit/types@npm:10.0.0"
3119+
dependencies:
3120+
"@octokit/openapi-types": ^18.0.0
3121+
checksum: 8aafba2ff0cd2435fb70c291bf75ed071c0fa8a865cf6169648732068a35dec7b85a345851f18920ec5f3e94ee0e954988485caac0da09ec3f6781cc44fe153a
3122+
languageName: node
3123+
linkType: hard
3124+
31183125
"@octokit/types@npm:^11.0.0, @octokit/types@npm:^11.1.0":
31193126
version: 11.1.0
31203127
resolution: "@octokit/types@npm:11.1.0"
@@ -3124,12 +3131,12 @@ __metadata:
31243131
languageName: node
31253132
linkType: hard
31263133

3127-
"@octokit/types@npm:^9.0.0, @octokit/types@npm:^9.2.3, @octokit/types@npm:^9.3.1":
3128-
version: 9.3.1
3129-
resolution: "@octokit/types@npm:9.3.1"
3134+
"@octokit/types@npm:^9.0.0, @octokit/types@npm:^9.2.3":
3135+
version: 9.3.2
3136+
resolution: "@octokit/types@npm:9.3.2"
31303137
dependencies:
31313138
"@octokit/openapi-types": ^18.0.0
3132-
checksum: 56fce104114730553c79175261f288a263055af4a6de848130fa964940460ee4fe8fa610f33dd0862c2c178d7d97f703e44a799898f3b52583e7ce5ae595f8ff
3139+
checksum: f55d096aaed3e04b8308d4422104fb888f355988056ba7b7ef0a4c397b8a3e54290d7827b06774dbe0c9ce55280b00db486286954f9c265aa6b03091026d9da8
31333140
languageName: node
31343141
linkType: hard
31353142

0 commit comments

Comments
 (0)