From 789a3c9de0c66a5ba0fa0925d3aeb31ec08d86b9 Mon Sep 17 00:00:00 2001 From: Kazato Sugimoto Date: Sun, 13 Nov 2022 20:12:26 +0900 Subject: [PATCH 1/5] Fix README --- README.md | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/README.md b/README.md index 598773e..cdb951b 100644 --- a/README.md +++ b/README.md @@ -6,22 +6,14 @@ Create a release pull request using GitHub API. Inspired by [git-pr-release](htt - No dependency on git. You can easily deploy it to Heroku / AWS Lambda / Google Cloud Functions etc. - Fast because it uses only Github API. -- Written in JavaScript. +- Written in TypeScript / JavaScript. [![Gyazo](http://i.gyazo.com/7484a59ade4e96ce9a015f1aa817cab8.png)](http://gyazo.com/7484a59ade4e96ce9a015f1aa817cab8) ## Usage -<<<<<<< HEAD - -### release(config) - -======= - ### API: release(config) -> > > > > > > origin/master - Create a release pull request and return Promise. You must pass a config as an argument. From f2b0cbfd78dc9189a8fe35e607750753335c3539 Mon Sep 17 00:00:00 2001 From: Kazato Sugimoto Date: Sun, 13 Nov 2022 20:15:31 +0900 Subject: [PATCH 2/5] Add release pr link to readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index cdb951b..c940093 100644 --- a/README.md +++ b/README.md @@ -175,6 +175,10 @@ The release flow of github-pr-release is managed with github-pr-release itself. It creates a release pull request when merging a topic branch or pushing to the main branch. The update can be published by merging a release pull request. +See: + +https://github.com/uiur/github-pr-release/pulls?q=is%3Apr+is%3Aopen+Release + ## License MIT From c0a0f58735ca55a4e75bbfd48c6a02861331c801 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Dec 2022 08:47:49 +0000 Subject: [PATCH 3/5] Bump qs from 6.5.2 to 6.5.3 Bumps [qs](https://github.com/ljharb/qs) from 6.5.2 to 6.5.3. - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.5.2...v6.5.3) --- updated-dependencies: - dependency-name: qs dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 204b17a..9be3867 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "github-pr-release", - "version": "1.3.4", + "version": "1.3.5", "license": "MIT", "dependencies": { "es6-promise": "^2.3.0", @@ -730,7 +730,7 @@ }, "node_modules/ansi-escapes": { "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", "dev": true, "engines": { @@ -1269,7 +1269,7 @@ }, "node_modules/callsites": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", "dev": true, "engines": { @@ -3024,7 +3024,7 @@ }, "node_modules/external-editor": { "version": "2.2.0", - "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "dependencies": { @@ -4003,7 +4003,7 @@ }, "node_modules/inquirer": { "version": "5.2.0", - "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "dependencies": { @@ -6844,9 +6844,9 @@ } }, "node_modules/qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", "engines": { "node": ">=0.6" } @@ -9711,7 +9711,7 @@ }, "ansi-escapes": { "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==", "dev": true }, @@ -10109,7 +10109,7 @@ }, "callsites": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", "dev": true }, @@ -11496,7 +11496,7 @@ }, "external-editor": { "version": "2.2.0", - "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz", "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==", "dev": true, "requires": { @@ -12211,7 +12211,7 @@ }, "inquirer": { "version": "5.2.0", - "resolved": "http://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-5.2.0.tgz", "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { @@ -14280,9 +14280,9 @@ } }, "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + "version": "6.5.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", + "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==" }, "quick-lru": { "version": "5.1.1", From adb2426ea81c402764fe31709df926e669c742d6 Mon Sep 17 00:00:00 2001 From: Kazato Sugimoto Date: Thu, 2 May 2024 19:22:53 +0900 Subject: [PATCH 4/5] Update ci node-version --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index d6ae307..9175ce5 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [12.x, 14.x, 16.x] + node-version: [18.x, 20.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: From 16c18d48b68cba4d828983f3a74c89c80e246974 Mon Sep 17 00:00:00 2001 From: D3I Date: Thu, 2 May 2024 19:23:42 +0900 Subject: [PATCH 5/5] fix base option from head option with `org:` (#47) --- src/github-client.ts | 2 +- test/github-client.ts | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/github-client.ts b/src/github-client.ts index 913fed2..f68b8d0 100644 --- a/src/github-client.ts +++ b/src/github-client.ts @@ -169,7 +169,7 @@ export default class GithubClient { return await this.get(this.pullRequestEndpoint(), { state: "closed", - base: this.head, + base: this.head.split(":").at(-1), per_page: 100, sort: "updated", direction: "desc", diff --git a/test/github-client.ts b/test/github-client.ts index a095038..f1452d2 100644 --- a/test/github-client.ts +++ b/test/github-client.ts @@ -177,6 +177,32 @@ describe("GithubClient", function () { }); }); + describe("#collectReleasePRs(): head option with `org:`", function () { + nock("https://api.github.com") + .get("/repos/uiureo/awesome-app/pulls/42/commits") + .query(true) + .reply(200, []) + .get( + "/repos/uiureo/awesome-app/pulls?state=closed&base=branch&per_page=100&sort=updated&direction=desc" + ) + .reply(200, []); + + it("returns prs that is going to be released", function (done) { + const client = new GithubClient({ + owner: "uiureo", + repo: "awesome-app", + head: "org:branch", + }); + client + .collectReleasePRs({ number: 42 }) + .then(function (prs) { + assert(prs.length === 0); + done(); + }) + .catch(done); + }); + }); + describe("#assignReviewers()", function () { const USER1 = "pr1-owner"; const USER2 = "pr2-owner";