From 2340193380d7f57cb0ec0f4bca925c2c5bc7bb6e Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:20:55 +0300 Subject: [PATCH 1/9] test commit --- .github/workflows/npm-gulp.yml | 2 +- gulpfile.js | 38 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/.github/workflows/npm-gulp.yml b/.github/workflows/npm-gulp.yml index 3f12365..b5c6734 100644 --- a/.github/workflows/npm-gulp.yml +++ b/.github/workflows/npm-gulp.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [12.x, 14.x, 16.x] + node-version: [\16.x] steps: - uses: actions/checkout@v3 diff --git a/gulpfile.js b/gulpfile.js index 9570383..c03a31f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,6 +82,44 @@ gulp.task("getpulls", async () => { const pulls = await octokit.request("GET /repos/bmsteven/demo/pulls", { owner: "bmsteven", repo: "demo", + base: "staging", }); console.log(pulls); + // await octokit.request('POST /repos/{owner}/{repo}/pulls', { + // owner: 'OWNER', + // repo: 'REPO', + // title: 'Amazing new feature', + // body: 'Please pull these awesome changes in!', + // head: 'octocat:new-feature', + // base: 'master' + // }) + // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}', { + // owner: 'OWNER', + // repo: 'REPO', + // pull_number: 'PULL_NUMBER' + // }) + // await octokit.request('PATCH /repos/{owner}/{repo}/pulls/{pull_number}', { + // owner: 'OWNER', + // repo: 'REPO', + // pull_number: 'PULL_NUMBER', + // title: 'new title', + // body: 'updated body', + // state: 'open', + // base: 'master' + // }) + // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}/commits', { + // owner: 'OWNER', + // repo: 'REPO', + // pull_number: 'PULL_NUMBER' + // }) + // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}/merge', { + // owner: 'OWNER', + // repo: 'REPO', + // pull_number: 'PULL_NUMBER' + // }) + // await octokit.request('PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge', { + // owner: 'OWNER', + // repo: 'REPO', + // pull_number: 'PULL_NUMBER' + // }) }); From 3b87b4e0fc7333e97959a46e12e4b0729ab3c260 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:21:31 +0300 Subject: [PATCH 2/9] test commit --- .github/workflows/merge_pull_request.yml | 8 ++++---- gulpfile.js | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/merge_pull_request.yml b/.github/workflows/merge_pull_request.yml index 464e120..9eef387 100644 --- a/.github/workflows/merge_pull_request.yml +++ b/.github/workflows/merge_pull_request.yml @@ -12,7 +12,7 @@ jobs: - name: Check Out Repo uses: actions/checkout@v2 - - name: 🔀 Merge Pull Request - uses: BaharaJr/merge-pr@0.0.1 - with: - GITHUB_TOKEN: ${{ secrets.TOKEN }} \ No newline at end of file + # - name: 🔀 Merge Pull Request + # uses: BaharaJr/merge-pr@0.0.1 + # with: + # GITHUB_TOKEN: ${{ secrets.TOKEN }} \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js index c03a31f..306aa08 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -85,6 +85,7 @@ gulp.task("getpulls", async () => { base: "staging", }); console.log(pulls); + // await octokit.request('POST /repos/{owner}/{repo}/pulls', { // owner: 'OWNER', // repo: 'REPO', From e4cbe537c948556bb3c2dd8994c91b8a3cca5428 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:23:10 +0300 Subject: [PATCH 3/9] test commit --- .github/workflows/npm-gulp.yml | 2 +- gulpfile.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/npm-gulp.yml b/.github/workflows/npm-gulp.yml index b5c6734..5ec5fa1 100644 --- a/.github/workflows/npm-gulp.yml +++ b/.github/workflows/npm-gulp.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [\16.x] + node-version: [14.x] steps: - uses: actions/checkout@v3 diff --git a/gulpfile.js b/gulpfile.js index 306aa08..c03a31f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -85,7 +85,6 @@ gulp.task("getpulls", async () => { base: "staging", }); console.log(pulls); - // await octokit.request('POST /repos/{owner}/{repo}/pulls', { // owner: 'OWNER', // repo: 'REPO', From 0b23302ae1f18424d91d0890ffeb39d154aece45 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:25:17 +0300 Subject: [PATCH 4/9] test commit --- .github/workflows/npm-gulp.yml | 2 +- gulpfile.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/npm-gulp.yml b/.github/workflows/npm-gulp.yml index 5ec5fa1..3f12365 100644 --- a/.github/workflows/npm-gulp.yml +++ b/.github/workflows/npm-gulp.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - node-version: [14.x] + node-version: [12.x, 14.x, 16.x] steps: - uses: actions/checkout@v3 diff --git a/gulpfile.js b/gulpfile.js index c03a31f..306aa08 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -85,6 +85,7 @@ gulp.task("getpulls", async () => { base: "staging", }); console.log(pulls); + // await octokit.request('POST /repos/{owner}/{repo}/pulls', { // owner: 'OWNER', // repo: 'REPO', From 43dcbb0d322788b6279c958ac5152db4fd12a825 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:29:47 +0300 Subject: [PATCH 5/9] test commit --- gulpfile.js | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 306aa08..607d2cd 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -94,11 +94,12 @@ gulp.task("getpulls", async () => { // head: 'octocat:new-feature', // base: 'master' // }) - // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}', { - // owner: 'OWNER', - // repo: 'REPO', - // pull_number: 'PULL_NUMBER' - // }) + const pull = await octokit.request("GET /repos/bmsteven/demo/pulls/16", { + owner: "bmsteven", + repo: "demo", + pull_number: "16", + }); + console.log(pull); // await octokit.request('PATCH /repos/{owner}/{repo}/pulls/{pull_number}', { // owner: 'OWNER', // repo: 'REPO', @@ -108,11 +109,15 @@ gulp.task("getpulls", async () => { // state: 'open', // base: 'master' // }) - // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}/commits', { - // owner: 'OWNER', - // repo: 'REPO', - // pull_number: 'PULL_NUMBER' - // }) + const commits = await octokit.request( + "GET /repos/bmsteven/demo/pulls/16/commits", + { + owner: "bmsteven", + repo: "demo", + pull_number: "16", + } + ); + console.log(commits); // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}/merge', { // owner: 'OWNER', // repo: 'REPO', From c82f5495119e209635d000350d5cf6d5526c9e19 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:42:29 +0300 Subject: [PATCH 6/9] finalize my research --- gulpfile.js | 84 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 57 insertions(+), 27 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 607d2cd..4a2b76d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -86,29 +86,23 @@ gulp.task("getpulls", async () => { }); console.log(pulls); - // await octokit.request('POST /repos/{owner}/{repo}/pulls', { - // owner: 'OWNER', - // repo: 'REPO', - // title: 'Amazing new feature', - // body: 'Please pull these awesome changes in!', - // head: 'octocat:new-feature', - // base: 'master' - // }) const pull = await octokit.request("GET /repos/bmsteven/demo/pulls/16", { owner: "bmsteven", repo: "demo", pull_number: "16", }); console.log(pull); - // await octokit.request('PATCH /repos/{owner}/{repo}/pulls/{pull_number}', { - // owner: 'OWNER', - // repo: 'REPO', - // pull_number: 'PULL_NUMBER', - // title: 'new title', - // body: 'updated body', - // state: 'open', - // base: 'master' - // }) + // update pull request + // await octokit.request("PATCH /repos/{owner}/{repo}/pulls/{pull_number}", { + // owner: "OWNER", + // repo: "REPO", + // pull_number: "PULL_NUMBER", + // title: "new title", + // body: "updated body", + // state: "open", + // base: "master", + // }); + // get pull request commits const commits = await octokit.request( "GET /repos/bmsteven/demo/pulls/16/commits", { @@ -118,14 +112,50 @@ gulp.task("getpulls", async () => { } ); console.log(commits); - // await octokit.request('GET /repos/{owner}/{repo}/pulls/{pull_number}/merge', { - // owner: 'OWNER', - // repo: 'REPO', - // pull_number: 'PULL_NUMBER' - // }) - // await octokit.request('PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge', { - // owner: 'OWNER', - // repo: 'REPO', - // pull_number: 'PULL_NUMBER' - // }) + // check if pull request was merged + const checkPulls = await octokit.request( + "GET /repos/{owner}/{repo}/pulls/{pull_number}/merge", + { + owner: "bmsteven", + repo: "demo", + pull_number: "16", + } + ); + console.log(checkPulls); + // merge pull request + const mergepr = await octokit.request( + "PUT /repos/bmsteven/demo/pulls/16/merge", + { + owner: "bmsteven", + repo: "demo", + pull_number: "16", + } + ); + console.log(mergepr); + // create new pull request + const createPr = await octokit.request("POST /repos/bmsteven/demo/pulls", { + owner: "bmsteven", + repo: "demo", + title: "Amazing new feature", + body: "Please pull these awesome changes in!", + head: "staging", + base: "master", + }); + console.log(createPr); }); + +// scheduled +// on: +// schedule: +// - cron: '30 5 * * 1,3' +// - cron: '30 5 * * 2,4' + +// jobs: +// test_schedule: +// runs-on: ubuntu-latest +// steps: +// - name: Not on Monday or Wednesday +// if: github.event.schedule != '30 5 * * 1,3' +// run: echo "This step will be skipped on Monday and Wednesday" +// - name: Every time +// run: echo "This step will always run" From e812e6eb84c7d294d43025b9c3a7b44d52593b26 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:45:37 +0300 Subject: [PATCH 7/9] finalize my research --- gulpfile.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 4a2b76d..7d29715 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -84,14 +84,14 @@ gulp.task("getpulls", async () => { repo: "demo", base: "staging", }); - console.log(pulls); + console.log("pulls", pulls?.data); const pull = await octokit.request("GET /repos/bmsteven/demo/pulls/16", { owner: "bmsteven", repo: "demo", pull_number: "16", }); - console.log(pull); + console.log("pull", pull?.data); // update pull request // await octokit.request("PATCH /repos/{owner}/{repo}/pulls/{pull_number}", { // owner: "OWNER", @@ -111,7 +111,7 @@ gulp.task("getpulls", async () => { pull_number: "16", } ); - console.log(commits); + console.log("commits", commits?.data); // check if pull request was merged const checkPulls = await octokit.request( "GET /repos/{owner}/{repo}/pulls/{pull_number}/merge", @@ -121,7 +121,7 @@ gulp.task("getpulls", async () => { pull_number: "16", } ); - console.log(checkPulls); + console.log("checkPulls", checkPulls?.data); // merge pull request const mergepr = await octokit.request( "PUT /repos/bmsteven/demo/pulls/16/merge", @@ -131,7 +131,7 @@ gulp.task("getpulls", async () => { pull_number: "16", } ); - console.log(mergepr); + console.log("mergepr", mergepr?.data); // create new pull request const createPr = await octokit.request("POST /repos/bmsteven/demo/pulls", { owner: "bmsteven", @@ -141,7 +141,7 @@ gulp.task("getpulls", async () => { head: "staging", base: "master", }); - console.log(createPr); + console.log("createPr", createPr?.data); }); // scheduled From 172f80c41fc10e22f44d7c6f35463fe0f36bfaa2 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:47:45 +0300 Subject: [PATCH 8/9] finalize my research --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 7d29715..5640920 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -114,7 +114,7 @@ gulp.task("getpulls", async () => { console.log("commits", commits?.data); // check if pull request was merged const checkPulls = await octokit.request( - "GET /repos/{owner}/{repo}/pulls/{pull_number}/merge", + "GET /repos/bmsteven/demo/pulls/16/merge", { owner: "bmsteven", repo: "demo", From df96609ec2a249d82dde6102a2e4bb09466c45d5 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 22 Apr 2022 00:50:34 +0300 Subject: [PATCH 9/9] finalize my research --- gulpfile.js | 118 +++++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 57 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 5640920..aad22fe 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -78,70 +78,74 @@ gulp.task("createnotification", async () => { }); gulp.task("getpulls", async () => { - const octokit = new Octokit({ auth: process.argv[4] }); - const pulls = await octokit.request("GET /repos/bmsteven/demo/pulls", { - owner: "bmsteven", - repo: "demo", - base: "staging", - }); - console.log("pulls", pulls?.data); - - const pull = await octokit.request("GET /repos/bmsteven/demo/pulls/16", { - owner: "bmsteven", - repo: "demo", - pull_number: "16", - }); - console.log("pull", pull?.data); - // update pull request - // await octokit.request("PATCH /repos/{owner}/{repo}/pulls/{pull_number}", { - // owner: "OWNER", - // repo: "REPO", - // pull_number: "PULL_NUMBER", - // title: "new title", - // body: "updated body", - // state: "open", - // base: "master", - // }); - // get pull request commits - const commits = await octokit.request( - "GET /repos/bmsteven/demo/pulls/16/commits", - { + try { + const octokit = new Octokit({ auth: process.argv[4] }); + const pulls = await octokit.request("GET /repos/bmsteven/demo/pulls", { owner: "bmsteven", repo: "demo", - pull_number: "16", - } - ); - console.log("commits", commits?.data); - // check if pull request was merged - const checkPulls = await octokit.request( - "GET /repos/bmsteven/demo/pulls/16/merge", - { + base: "staging", + }); + console.log("pulls", pulls?.data); + + const pull = await octokit.request("GET /repos/bmsteven/demo/pulls/16", { owner: "bmsteven", repo: "demo", pull_number: "16", - } - ); - console.log("checkPulls", checkPulls?.data); - // merge pull request - const mergepr = await octokit.request( - "PUT /repos/bmsteven/demo/pulls/16/merge", - { + }); + console.log("pull", pull?.data); + // update pull request + // await octokit.request("PATCH /repos/{owner}/{repo}/pulls/{pull_number}", { + // owner: "OWNER", + // repo: "REPO", + // pull_number: "PULL_NUMBER", + // title: "new title", + // body: "updated body", + // state: "open", + // base: "master", + // }); + // get pull request commits + const commits = await octokit.request( + "GET /repos/bmsteven/demo/pulls/16/commits", + { + owner: "bmsteven", + repo: "demo", + pull_number: "16", + } + ); + console.log("commits", commits?.data); + // check if pull request was merged + // const checkPulls = await octokit.request( + // "GET /repos/bmsteven/demo/pulls/16/merge", + // { + // owner: "bmsteven", + // repo: "demo", + // pull_number: "16", + // } + // ); + // console.log("checkPulls", checkPulls?.data); + // merge pull request + const mergepr = await octokit.request( + "PUT /repos/bmsteven/demo/pulls/16/merge", + { + owner: "bmsteven", + repo: "demo", + pull_number: "16", + } + ); + console.log("mergepr", mergepr?.data); + // create new pull request + const createPr = await octokit.request("POST /repos/bmsteven/demo/pulls", { owner: "bmsteven", repo: "demo", - pull_number: "16", - } - ); - console.log("mergepr", mergepr?.data); - // create new pull request - const createPr = await octokit.request("POST /repos/bmsteven/demo/pulls", { - owner: "bmsteven", - repo: "demo", - title: "Amazing new feature", - body: "Please pull these awesome changes in!", - head: "staging", - base: "master", - }); - console.log("createPr", createPr?.data); + title: "Amazing new feature", + body: "Please pull these awesome changes in!", + head: "staging", + base: "master", + }); + console.log("createPr", createPr?.data); + } catch (error) { + console.log(error?.message); + } }); // scheduled