Skip to content

Use source branch #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cognifloyd wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Use source branch #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c3d9660
clarify sha used to create newBranch
cognifloyd Oct 5, 2020
da454b8
use sourceBranch to make newBranch
cognifloyd Oct 5, 2020
5fc9788
Add newBranch output var
cognifloyd Oct 5, 2020
bb8becc
rebuild
cognifloyd Oct 5, 2020
7b5d033
Use github.context.repo instead of payload.repository
cognifloyd Jan 8, 2021
2869c9f
rebuild
cognifloyd Jan 8, 2021
cd2f21e
more log lines
cognifloyd Jul 8, 2021
8c5e000
improve PR URL in log output
cognifloyd Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ To work properly delete created branches after merging them.

### `TARGET_BRANCH`

**Required** The branchs you want to make the pull request to. Multiple branches need to be separate by comma like in example
**Required** The branches you want to make the pull request to. Multiple branches need to be separated by comma like in example

## Outputs

Expand All @@ -28,6 +28,10 @@ Set to the URL of either the pull request that was opened by this action or the

Pull request number from generated pull request or the currently open one

### `PULL_REQUEST_NUMBER`

The intermediate branch name used to create the pull request.

### Example

```yml
Expand Down
8 changes: 4 additions & 4 deletions create-branch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
async function createBranch(octokit, context, branch) {
async function createBranch(octokit, repo, sha, branch) {
try {
await octokit.repos.getBranch({
...context.repo,
...repo,
branch,
});
} catch (error) {
if (error.name === "HttpError" && error.status === 404) {
await octokit.git.createRef({
ref: `refs/heads/${branch}`,
sha: context.sha,
...context.repo,
sha: sha,
...repo,
});
} else {
console.log("Error while creating new branch");
Expand Down
42 changes: 24 additions & 18 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ module.exports = require("os");
const core = __webpack_require__(470);
const github = __webpack_require__(469);
const createBranch = __webpack_require__(503);
//

async function run() {
try {
const sourceBranch = core.getInput("SOURCE_BRANCH", { required: true });
Expand All @@ -516,39 +516,45 @@ async function run() {

for (let branch of targetBranchesArray) {
console.log(`Making a pull request for ${branch} from ${sourceBranch}.`);
const {
payload: { repository },
} = github.context;
const context = github.context;

const octokit = new github.GitHub(githubToken);
//part of test
const { data: currentPulls } = await octokit.pulls.list({
owner: repository.owner.login,
repo: repository.name,
...context.repo,
});
//create new branch from master branch and PR between new branch and target branch
//create new branch from source branch and PR between new branch and target branch

const context = github.context;
const newBranch = `${branch}-sync-${context.sha.slice(-4)}`;
await createBranch(octokit, context, newBranch);
const {
data: { object: { sha } }
} = await octokit.git.getRef({
ref: `heads/${sourceBranch}`,
...context.repo,
});
console.log(`${sourceBranch} is at ${sha}.`);

const newBranch = `${branch}-sync-${sha.slice(-4)}`;
await createBranch(octokit, context.repo, sha, newBranch);
console.log(`Intermediate branch for PR: ${newBranch}.`);

const currentPull = currentPulls.find((pull) => {
return pull.head.ref === newBranch && pull.base.ref === branch;
});
console.log(`currentPull: ${currentPull}`);

core.setOutput("PULL_REQUEST_BRANCH", newBranch);
if (!currentPull) {
const { data: pullRequest } = await octokit.pulls.create({
owner: repository.owner.login,
repo: repository.name,
head: newBranch,
base: branch,
title: `sync: ${branch} with ${newBranch}`,
body: `sync-branches: syncing branch with ${newBranch}`,
draft: false,
...context.repo,
});

console.log(
`Pull request (${pullRequest.number}) successful! You can view it here: ${pullRequest.url}.`
`Pull request (${pullRequest.number}) successful! You can view it here: ${pullRequest.html_url}`
);

core.setOutput("PULL_REQUEST_URL", pullRequest.url.toString());
Expand Down Expand Up @@ -2087,7 +2093,7 @@ module.exports = require("https");
/***/ 215:
/***/ (function(module) {

module.exports = {"_from":"@octokit/rest@^16.43.1","_id":"@octokit/rest@16.43.1","_inBundle":false,"_integrity":"sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==","_location":"/@octokit/rest","_phantomChildren":{"@types/node":"14.0.5","deprecation":"2.3.1","once":"1.4.0","os-name":"3.1.0"},"_requested":{"type":"range","registry":true,"raw":"@octokit/rest@^16.43.1","name":"@octokit/rest","escapedName":"@octokit%2frest","scope":"@octokit","rawSpec":"^16.43.1","saveSpec":null,"fetchSpec":"^16.43.1"},"_requiredBy":["/@actions/github"],"_resolved":"https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz","_shasum":"3b11e7d1b1ac2bbeeb23b08a17df0b20947eda6b","_spec":"@octokit/rest@^16.43.1","_where":"/home/bluesky/rahul/create-sync-pr/node_modules/@actions/github","author":{"name":"Gregor Martynus","url":"https://github.com/gr2m"},"bugs":{"url":"https://github.com/octokit/rest.js/issues"},"bundleDependencies":false,"bundlesize":[{"path":"./dist/octokit-rest.min.js.gz","maxSize":"33 kB"}],"contributors":[{"name":"Mike de Boer","email":"info@mikedeboer.nl"},{"name":"Fabian Jakobs","email":"fabian@c9.io"},{"name":"Joe Gallo","email":"joe@brassafrax.com"},{"name":"Gregor Martynus","url":"https://github.com/gr2m"}],"dependencies":{"@octokit/auth-token":"^2.4.0","@octokit/plugin-paginate-rest":"^1.1.1","@octokit/plugin-request-log":"^1.0.0","@octokit/plugin-rest-endpoint-methods":"2.4.0","@octokit/request":"^5.2.0","@octokit/request-error":"^1.0.2","atob-lite":"^2.0.0","before-after-hook":"^2.0.0","btoa-lite":"^1.0.0","deprecation":"^2.0.0","lodash.get":"^4.4.2","lodash.set":"^4.3.2","lodash.uniq":"^4.5.0","octokit-pagination-methods":"^1.1.0","once":"^1.4.0","universal-user-agent":"^4.0.0"},"deprecated":false,"description":"GitHub REST API client for Node.js","devDependencies":{"@gimenete/type-writer":"^0.1.3","@octokit/auth":"^1.1.1","@octokit/fixtures-server":"^5.0.6","@octokit/graphql":"^4.2.0","@types/node":"^13.1.0","bundlesize":"^0.18.0","chai":"^4.1.2","compression-webpack-plugin":"^3.1.0","cypress":"^3.0.0","glob":"^7.1.2","http-proxy-agent":"^4.0.0","lodash.camelcase":"^4.3.0","lodash.merge":"^4.6.1","lodash.upperfirst":"^4.3.1","lolex":"^5.1.2","mkdirp":"^1.0.0","mocha":"^7.0.1","mustache":"^4.0.0","nock":"^11.3.3","npm-run-all":"^4.1.2","nyc":"^15.0.0","prettier":"^1.14.2","proxy":"^1.0.0","semantic-release":"^17.0.0","sinon":"^8.0.0","sinon-chai":"^3.0.0","sort-keys":"^4.0.0","string-to-arraybuffer":"^1.0.0","string-to-jsdoc-comment":"^1.0.0","typescript":"^3.3.1","webpack":"^4.0.0","webpack-bundle-analyzer":"^3.0.0","webpack-cli":"^3.0.0"},"files":["index.js","index.d.ts","lib","plugins"],"homepage":"https://github.com/octokit/rest.js#readme","keywords":["octokit","github","rest","api-client"],"license":"MIT","name":"@octokit/rest","nyc":{"ignore":["test"]},"publishConfig":{"access":"public"},"release":{"publish":["@semantic-release/npm",{"path":"@semantic-release/github","assets":["dist/*","!dist/*.map.gz"]}]},"repository":{"type":"git","url":"git+https://github.com/octokit/rest.js.git"},"scripts":{"build":"npm-run-all build:*","build:browser":"npm-run-all build:browser:*","build:browser:development":"webpack --mode development --entry . --output-library=Octokit --output=./dist/octokit-rest.js --profile --json > dist/bundle-stats.json","build:browser:production":"webpack --mode production --entry . --plugin=compression-webpack-plugin --output-library=Octokit --output-path=./dist --output-filename=octokit-rest.min.js --devtool source-map","build:ts":"npm run -s update-endpoints:typescript","coverage":"nyc report --reporter=html && open coverage/index.html","generate-bundle-report":"webpack-bundle-analyzer dist/bundle-stats.json --mode=static --no-open --report dist/bundle-report.html","lint":"prettier --check '{lib,plugins,scripts,test}/**/*.{js,json,ts}' 'docs/*.{js,json}' 'docs/src/**/*' index.js README.md package.json","lint:fix":"prettier --write '{lib,plugins,scripts,test}/**/*.{js,json,ts}' 'docs/*.{js,json}' 'docs/src/**/*' index.js README.md package.json","postvalidate:ts":"tsc --noEmit --target es6 test/typescript-validate.ts","prebuild:browser":"mkdirp dist/","pretest":"npm run -s lint","prevalidate:ts":"npm run -s build:ts","start-fixtures-server":"octokit-fixtures-server","test":"nyc mocha test/mocha-node-setup.js \"test/*/**/*-test.js\"","test:browser":"cypress run --browser chrome","update-endpoints":"npm-run-all update-endpoints:*","update-endpoints:fetch-json":"node scripts/update-endpoints/fetch-json","update-endpoints:typescript":"node scripts/update-endpoints/typescript","validate:ts":"tsc --target es6 --noImplicitAny index.d.ts"},"types":"index.d.ts","version":"16.43.1"};
module.exports = {"_args":[["@octokit/rest@16.43.1","/home/cognifloyd/g/github/cognifloyd/create-sync-pr.git"]],"_from":"@octokit/rest@16.43.1","_id":"@octokit/rest@16.43.1","_inBundle":false,"_integrity":"sha512-gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw==","_location":"/@octokit/rest","_phantomChildren":{"@types/node":"14.0.5","deprecation":"2.3.1","once":"1.4.0","os-name":"3.1.0"},"_requested":{"type":"version","registry":true,"raw":"@octokit/rest@16.43.1","name":"@octokit/rest","escapedName":"@octokit%2frest","scope":"@octokit","rawSpec":"16.43.1","saveSpec":null,"fetchSpec":"16.43.1"},"_requiredBy":["/@actions/github"],"_resolved":"https://registry.npmjs.org/@octokit/rest/-/rest-16.43.1.tgz","_spec":"16.43.1","_where":"/home/cognifloyd/g/github/cognifloyd/create-sync-pr.git","author":{"name":"Gregor Martynus","url":"https://github.com/gr2m"},"bugs":{"url":"https://github.com/octokit/rest.js/issues"},"bundlesize":[{"path":"./dist/octokit-rest.min.js.gz","maxSize":"33 kB"}],"contributors":[{"name":"Mike de Boer","email":"info@mikedeboer.nl"},{"name":"Fabian Jakobs","email":"fabian@c9.io"},{"name":"Joe Gallo","email":"joe@brassafrax.com"},{"name":"Gregor Martynus","url":"https://github.com/gr2m"}],"dependencies":{"@octokit/auth-token":"^2.4.0","@octokit/plugin-paginate-rest":"^1.1.1","@octokit/plugin-request-log":"^1.0.0","@octokit/plugin-rest-endpoint-methods":"2.4.0","@octokit/request":"^5.2.0","@octokit/request-error":"^1.0.2","atob-lite":"^2.0.0","before-after-hook":"^2.0.0","btoa-lite":"^1.0.0","deprecation":"^2.0.0","lodash.get":"^4.4.2","lodash.set":"^4.3.2","lodash.uniq":"^4.5.0","octokit-pagination-methods":"^1.1.0","once":"^1.4.0","universal-user-agent":"^4.0.0"},"description":"GitHub REST API client for Node.js","devDependencies":{"@gimenete/type-writer":"^0.1.3","@octokit/auth":"^1.1.1","@octokit/fixtures-server":"^5.0.6","@octokit/graphql":"^4.2.0","@types/node":"^13.1.0","bundlesize":"^0.18.0","chai":"^4.1.2","compression-webpack-plugin":"^3.1.0","cypress":"^3.0.0","glob":"^7.1.2","http-proxy-agent":"^4.0.0","lodash.camelcase":"^4.3.0","lodash.merge":"^4.6.1","lodash.upperfirst":"^4.3.1","lolex":"^5.1.2","mkdirp":"^1.0.0","mocha":"^7.0.1","mustache":"^4.0.0","nock":"^11.3.3","npm-run-all":"^4.1.2","nyc":"^15.0.0","prettier":"^1.14.2","proxy":"^1.0.0","semantic-release":"^17.0.0","sinon":"^8.0.0","sinon-chai":"^3.0.0","sort-keys":"^4.0.0","string-to-arraybuffer":"^1.0.0","string-to-jsdoc-comment":"^1.0.0","typescript":"^3.3.1","webpack":"^4.0.0","webpack-bundle-analyzer":"^3.0.0","webpack-cli":"^3.0.0"},"files":["index.js","index.d.ts","lib","plugins"],"homepage":"https://github.com/octokit/rest.js#readme","keywords":["octokit","github","rest","api-client"],"license":"MIT","name":"@octokit/rest","nyc":{"ignore":["test"]},"publishConfig":{"access":"public"},"release":{"publish":["@semantic-release/npm",{"path":"@semantic-release/github","assets":["dist/*","!dist/*.map.gz"]}]},"repository":{"type":"git","url":"git+https://github.com/octokit/rest.js.git"},"scripts":{"build":"npm-run-all build:*","build:browser":"npm-run-all build:browser:*","build:browser:development":"webpack --mode development --entry . --output-library=Octokit --output=./dist/octokit-rest.js --profile --json > dist/bundle-stats.json","build:browser:production":"webpack --mode production --entry . --plugin=compression-webpack-plugin --output-library=Octokit --output-path=./dist --output-filename=octokit-rest.min.js --devtool source-map","build:ts":"npm run -s update-endpoints:typescript","coverage":"nyc report --reporter=html && open coverage/index.html","generate-bundle-report":"webpack-bundle-analyzer dist/bundle-stats.json --mode=static --no-open --report dist/bundle-report.html","lint":"prettier --check '{lib,plugins,scripts,test}/**/*.{js,json,ts}' 'docs/*.{js,json}' 'docs/src/**/*' index.js README.md package.json","lint:fix":"prettier --write '{lib,plugins,scripts,test}/**/*.{js,json,ts}' 'docs/*.{js,json}' 'docs/src/**/*' index.js README.md package.json","postvalidate:ts":"tsc --noEmit --target es6 test/typescript-validate.ts","prebuild:browser":"mkdirp dist/","pretest":"npm run -s lint","prevalidate:ts":"npm run -s build:ts","start-fixtures-server":"octokit-fixtures-server","test":"nyc mocha test/mocha-node-setup.js \"test/*/**/*-test.js\"","test:browser":"cypress run --browser chrome","update-endpoints":"npm-run-all update-endpoints:*","update-endpoints:fetch-json":"node scripts/update-endpoints/fetch-json","update-endpoints:typescript":"node scripts/update-endpoints/typescript","validate:ts":"tsc --target es6 --noImplicitAny index.d.ts"},"types":"index.d.ts","version":"16.43.1"};

/***/ }),

Expand Down Expand Up @@ -7522,18 +7528,18 @@ exports.RequestError = RequestError;
/***/ 503:
/***/ (function(module) {

async function createBranch(octokit, context, branch) {
async function createBranch(octokit, repo, sha, branch) {
try {
await octokit.repos.getBranch({
...context.repo,
...repo,
branch,
});
} catch (error) {
if (error.name === "HttpError" && error.status === 404) {
await octokit.git.createRef({
ref: `refs/heads/${branch}`,
sha: context.sha,
...context.repo,
sha: sha,
...repo,
});
} else {
console.log("Error while creating new branch");
Expand Down
30 changes: 18 additions & 12 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,39 +12,45 @@ async function run() {

for (let branch of targetBranchesArray) {
console.log(`Making a pull request for ${branch} from ${sourceBranch}.`);
const {
payload: { repository },
} = github.context;
const context = github.context;

const octokit = new github.GitHub(githubToken);
//part of test
const { data: currentPulls } = await octokit.pulls.list({
owner: repository.owner.login,
repo: repository.name,
...context.repo,
});
//create new branch from master branch and PR between new branch and target branch
//create new branch from source branch and PR between new branch and target branch

const context = github.context;
const newBranch = `${branch}-sync-${context.sha.slice(-4)}`;
await createBranch(octokit, context, newBranch);
const {
data: { object: { sha } }
} = await octokit.git.getRef({
ref: `heads/${sourceBranch}`,
...context.repo,
});
console.log(`${sourceBranch} is at ${sha}.`);

const newBranch = `${branch}-sync-${sha.slice(-4)}`;
await createBranch(octokit, context.repo, sha, newBranch);
console.log(`Intermediate branch for PR: ${newBranch}.`);

const currentPull = currentPulls.find((pull) => {
return pull.head.ref === newBranch && pull.base.ref === branch;
});
console.log(`currentPull: ${currentPull}`);

core.setOutput("PULL_REQUEST_BRANCH", newBranch);
if (!currentPull) {
const { data: pullRequest } = await octokit.pulls.create({
owner: repository.owner.login,
repo: repository.name,
head: newBranch,
base: branch,
title: `sync: ${branch} with ${newBranch}`,
body: `sync-branches: syncing branch with ${newBranch}`,
draft: false,
...context.repo,
});

console.log(
`Pull request (${pullRequest.number}) successful! You can view it here: ${pullRequest.url}.`
`Pull request (${pullRequest.number}) successful! You can view it here: ${pullRequest.html_url}`
);

core.setOutput("PULL_REQUEST_URL", pullRequest.url.toString());
Expand Down