Skip to content

Commit

Permalink
Merge pull request #306 from korthout/release-v1
Browse files Browse the repository at this point in the history
Release v1
  • Loading branch information
korthout authored Dec 21, 2022
2 parents 2b85f05 + b42dc40 commit ec1dcbe
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Create backport pull requests
uses: zeebe-io/backport-action@v1-rc1
uses: korthout/backport-action@v1
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ For each of those labels:
This backport action is able to deal with so called `octopus` merges (i.e. merges of multiple branches with a single commit).
Therefore, this action is compatible with [Bors](https://bors.tech/), [GitHub Merge Queue](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue) and similar tools.

> **Note**
> Version `1.0.0` (i.e. `v1`) will be released soon.
> You can already try it out using the latest pre-release `v1-rc1`.
> After the `v1` release, [SemVer](https://semver.org/) will be respected.
> The repo will also move from [zeebe-io/backport-action](https://github.com/zeebe-io/backport-action) to [korthout/backport-action](https://github.com/korthout/backport-action).
> You can read more about it [here](https://github.com/zeebe-io/backport-action/issues/289).
## Usage

Add the following workflow configuration to your repository's `.github/workflows` folder.
Expand All @@ -44,7 +37,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Create backport pull requests
uses: zeebe-io/backport-action@v1-rc1
uses: korthout/backport-action@v1
with:
# Optional
# Token to authenticate requests to GitHub
Expand Down Expand Up @@ -116,7 +109,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Create backport pull requests
uses: zeebe-io/backport-action@v1-rc1
uses: korthout/backport-action@v1
with:
# Optional
# Token to authenticate requests to GitHub
Expand Down Expand Up @@ -158,7 +151,7 @@ The following placeholders are available and are replaced with:

Placeholder | Replaced with
------------|------------
`issue_refs` | GitHub issue references to all issues mentioned in the original pull request description seperated by a space, e.g. `#123 #456 zeebe-io/backport-action#789`
`issue_refs` | GitHub issue references to all issues mentioned in the original pull request description seperated by a space, e.g. `#123 #456 korthout/backport-action#789`
`pull_author` | The username of the original pull request's author, e.g. `korthout`
`pull_number` | The number of the original pull request that is backported, e.g. `123`
`pull_title` | The title of the original pull request that is backported, e.g. `fix: some error`
Expand Down
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "backport-action"
description: "Automatically backport pull requests"
author: "zeebe-io"
author: "korthout"
inputs:
github_token:
description: >
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ class Backport {
git cherry-pick -x $ancref..${headref}
\`\`\``
: (0, dedent_1.default) `Note that rebase and squash merges are not supported at this time.
For more information see https://github.com/zeebe-io/backport-action/issues/46.`;
For more information see https://github.com/korthout/backport-action/issues/46.`;
return (0, dedent_1.default) `Backport failed for \`${target}\`, ${reason}.

Please cherry-pick the changes locally.
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "backport-action",
"version": "1.0.0-rc1",
"private": true,
"version": "1.0.0",
"private": false,
"description": "GitHub action to automatically backport pull requests",
"main": "lib/main.js",
"scripts": {
Expand All @@ -15,13 +15,13 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/zeebe-io/backport-action.git"
"url": "git+https://github.com/korthout/backport-action.git"
},
"keywords": [
"actions",
"backport"
],
"author": "zeebe-io",
"author": "korthout",
"license": "MIT",
"dependencies": {
"@actions/core": "^1.10.0",
Expand Down
2 changes: 1 addition & 1 deletion src/backport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export class Backport {
git cherry-pick -x $ancref..${headref}
\`\`\``
: dedent`Note that rebase and squash merges are not supported at this time.
For more information see https://github.com/zeebe-io/backport-action/issues/46.`;
For more information see https://github.com/korthout/backport-action/issues/46.`;

return dedent`Backport failed for \`${target}\`, ${reason}.
Expand Down

0 comments on commit ec1dcbe

Please sign in to comment.