Skip to content

Commit

Permalink
Fixing prettier errors, updating changelog
Browse files Browse the repository at this point in the history
Signed-off-by: Vacha Shah <[email protected]>
  • Loading branch information
VachaShah committed Mar 21, 2023
1 parent c0583b1 commit a82e65e
Show file tree
Hide file tree
Showing 5 changed files with 444 additions and 476 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Test
on:
push:
branches-ignore:
- main
on: [push, pull_request]

jobs:
test:
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# 2.0 (Upcoming)
# 2.1.0 (10/28/2022)

- Put worktree outside of repo in manual steps ([#5](https://github.com/VachaShah/backport/pull/5))
- Retry post error for filtering out files ([#6](https://github.com/VachaShah/backport/pull/6))

# 2.0.0 (10/26/2022)

- Adding manual trigger for publish workflow
- Fixing filestoskip option after merge
- Add support for skipping certain files for backporting ([#4](https://github.com/VachaShah/backport/pull/4))
- Removing custom branch name as it is now available in upstream
- Merge changes from upstream.

# 1.1.4 (1/6/2022)

- [#1](https://github.com/VachaShah/backport/pull/1): Adding an option for custom branch name for backport - [@vachshah](https://github.com/VachaShah).
- Adding an option for custom branch name for backport. ([#1](https://github.com/VachaShah/backport/pull/1))
- Initial fork from [tibdex/backport](https://github.com/tibdex/backport).
2 changes: 2 additions & 0 deletions src/backport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,11 @@ const backportOnce = async ({
);
}

/* eslint-disable no-await-in-loop */
for (const file of filesToSkip) {
await git("checkout", "HEAD", file);
}
/* eslint-enable no-await-in-loop */

await git("commit", "--no-edit", "-s");
} catch (error: unknown) {
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { PullRequestEvent } from "@octokit/webhooks-types";
import ensureError from "ensure-error";
import { template } from "lodash-es";
import { backport } from "./backport.js";
import { getFilesToSkip } from "./get-files-to-skip";
import { getFilesToSkip } from "./get-files-to-skip.js";

const run = async () => {
try {
Expand Down
Loading

0 comments on commit a82e65e

Please sign in to comment.