Skip to content
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.

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

Add git config user.email and user.name #307

Merged
merged 8 commits into from
Feb 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,5 @@ See [CONTRIBUTING.md](https://github.com/sqren/backport/blob/master/CONTRIBUTING
[1]: https://git-scm.com/docs/git-cherry-pick#Documentation/git-cherry-pick.txt--x
[2]: https://docs.github.com/en/search-github/getting-started-with-searching-on-github/understanding-the-search-syntax

[![Build Status](https://travis-ci.com/sqren/backport.svg?branch=master)](https://app.travis-ci.com/github/sqren/backport)
[![NPM version](https://img.shields.io/npm/v/backport.svg)](https://www.npmjs.com/package/backport)
[![Coverage Status](https://coveralls.io/repos/github/sqren/backport/badge.svg?branch=master)](https://coveralls.io/github/sqren/backport?branch=master)
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"prepare": "husky install",
"prepublishOnly": "yarn lint && yarn tsc",
"extractPackageVersion": "node -p \"'export const PACKAGE_VERSION = ' + JSON.stringify(require('./package.json').version) + ';'\" | prettier > src/utils/packageVersion.ts",
"lint-and-test": "yarn tsc && yarn lint && yarn test-all",
"lint": "echo \"Running lint\" && eslint './**/*.{ts,js}'",
"start": "ts-node --transpile-only ./src/entrypoint.cli.ts",
"test-all": "jest --config ./jest.config.all.js",
Expand Down
1 change: 1 addition & 0 deletions src/entrypoint.cli.private.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ describe('entrypoint.module', () => {

const expectedCommits: Commit[] = [
{
author: { email: 'sorenlouv@gmail.com', name: 'Søren Louv-Jansen' },
sourceCommit: {
committedDate: '2020-08-15T10:44:04Z',
message: 'Add family emoji (#2)',
Expand Down
2 changes: 2 additions & 0 deletions src/options/ConfigOptions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ type Options = Partial<{
gitHostname: string;
githubApiBaseUrlV3: string;
githubApiBaseUrlV4: string;
gitUserEmail: string;
gitUserName: string;
logFilePath: string;
maxNumber: number;
multiple: boolean;
Expand Down
239 changes: 0 additions & 239 deletions src/runSequentially.test.ts

This file was deleted.

4 changes: 2 additions & 2 deletions src/runSequentially.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { logger, consoleLog } from './services/logger';
import { sequentially } from './services/sequentially';
import { Commit } from './services/sourceCommit/parseSourceCommit';
import { cherrypickAndCreateTargetPullRequest } from './ui/cherrypickAndCreateTargetPullRequest';
import { maybeSetupRepo } from './ui/maybeSetupRepo';
import { setupRepo } from './ui/setupRepo';

export type Result =
| {
Expand Down Expand Up @@ -32,7 +32,7 @@ export async function runSequentially({
targetBranches: string[];
}): Promise<Result[]> {
logger.verbose('Backport options', options);
await maybeSetupRepo(options);
await setupRepo(options, commits);
const results = [] as Result[];
await sequentially(targetBranches, async (targetBranch) => {
logger.info(`Backporting ${JSON.stringify(commits)} to ${targetBranch}`);
Expand Down
Loading