Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: korthout/backport-action
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.4.1
Choose a base ref
...
head repository: korthout/backport-action
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.5.0
Choose a head ref
  • 17 commits
  • 10 files changed
  • 6 contributors

Commits on Jan 23, 2024

  1. dist: release 2.5.0-SNAPSHOT

    Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    github-actions[bot] committed Jan 23, 2024
    Copy the full SHA
    6e72f98 View commit details

Commits on Jan 29, 2024

  1. build(deps): bump madhead/semver-utils from 3 to 4

    Bumps [madhead/semver-utils](https://github.com/madhead/semver-utils) from 3 to 4.
    - [Release notes](https://github.com/madhead/semver-utils/releases)
    - [Commits](madhead/semver-utils@v3...v4)
    
    ---
    updated-dependencies:
    - dependency-name: madhead/semver-utils
      dependency-type: direct:production
      update-type: version-update:semver-major
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jan 29, 2024
    Copy the full SHA
    49dfc08 View commit details

Commits on Feb 5, 2024

  1. build(deps-dev): bump prettier from 3.2.4 to 3.2.5

    Bumps [prettier](https://github.com/prettier/prettier) from 3.2.4 to 3.2.5.
    - [Release notes](https://github.com/prettier/prettier/releases)
    - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
    - [Commits](prettier/prettier@3.2.4...3.2.5)
    
    ---
    updated-dependencies:
    - dependency-name: prettier
      dependency-type: direct:development
      update-type: version-update:semver-patch
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 5, 2024
    Copy the full SHA
    2d9fa3e View commit details

Commits on Feb 16, 2024

  1. build(deps): bump undici from 5.27.0 to 5.28.3

    Bumps [undici](https://github.com/nodejs/undici) from 5.27.0 to 5.28.3.
    - [Release notes](https://github.com/nodejs/undici/releases)
    - [Commits](nodejs/undici@v5.27.0...v5.28.3)
    
    ---
    updated-dependencies:
    - dependency-name: undici
      dependency-type: indirect
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 16, 2024
    Copy the full SHA
    35233d6 View commit details

Commits on Feb 25, 2024

  1. Merge pull request #412 from korthout/dependabot/github_actions/madhe…

    …ad/semver-utils-4
    
    build(deps): bump madhead/semver-utils from 3 to 4
    korthout authored Feb 25, 2024
    Copy the full SHA
    bce8ce5 View commit details
  2. Merge pull request #413 from korthout/dependabot/npm_and_yarn/prettie…

    …r-3.2.5
    
    build(deps-dev): bump prettier from 3.2.4 to 3.2.5
    korthout authored Feb 25, 2024
    Copy the full SHA
    c886160 View commit details
  3. Merge pull request #414 from korthout/dependabot/npm_and_yarn/undici-…

    …5.28.3
    
    build(deps): bump undici from 5.27.0 to 5.28.3
    korthout authored Feb 25, 2024
    Copy the full SHA
    c1939fa View commit details
  4. dist: build new artifacts

    Signed-off-by: Nico Korthout <korthout@users.noreply.github.com>
    korthout committed Feb 25, 2024
    Copy the full SHA
    1081c49 View commit details

Commits on Mar 28, 2024

  1. Copy the full SHA
    cd13022 View commit details

Commits on Mar 29, 2024

  1. Update action.yml

    Co-authored-by: Nico Korthout <korthout@users.noreply.github.com>
    AlexVermette-Eaton and korthout authored Mar 29, 2024
    Copy the full SHA
    e7b873b View commit details
  2. Copy the full SHA
    b3fef5a View commit details
  3. Copy the full SHA
    1126229 View commit details
  4. added to ReadMe

    AlexVermette-Eaton committed Mar 29, 2024
    Copy the full SHA
    34d8598 View commit details

Commits on Mar 30, 2024

  1. style: auto format

    korthout committed Mar 30, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c36b5ac View commit details
  2. dist: build new version

    korthout committed Mar 30, 2024
    Copy the full SHA
    e0ada12 View commit details
  3. Merge pull request #416 from AlexVermette-Eaton/feature/branch_name

    Add configurable `branch_name` input
    korthout authored Mar 30, 2024
    Copy the full SHA
    891b4f5 View commit details
  4. dist: release 2.5.0

    Signed-off-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
    github-actions[bot] committed Mar 30, 2024
    Copy the full SHA
    ef20d86 View commit details
Showing with 781 additions and 264 deletions.
  1. +1 −1 .github/workflows/release.yml
  2. +1 −0 .gitignore
  3. +10 −0 README.md
  4. +7 −0 action.yml
  5. +742 −249 dist/index.js
  6. +1 −1 dist/index.js.map
  7. +9 −9 package-lock.json
  8. +2 −2 package.json
  9. +6 −1 src/backport.ts
  10. +2 −1 src/main.ts
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ jobs:
regex: false

- name: Extract semver release version components
uses: madhead/semver-utils@v3
uses: madhead/semver-utils@v4
id: version
with:
version: ${{ inputs.releaseVersion }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
lib
.vscode/
.vs/

# Modified from https://www.toptal.com/developers/gitignore/api/node,intellij+all,visualstudiocode,macos,windows
#dist # removed because this action requires the dist to be available in the repo
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -105,6 +105,16 @@ jobs:
The action can be configured with the following optional [inputs](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepswith):
### `branch_name`

Default: `backport-${pull_number}-to-${target_branch}`

Template used as the name for branches created by this action.

Placeholders can be used to define variable values.
These are indicated by a dollar sign and curly braces (`${placeholder}`).
Please refer to this action's README for all available [placeholders](#placeholders).

### `copy_assignees`

Default: `false` (disabled)
7 changes: 7 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
@@ -3,6 +3,13 @@ description: >
Fast and flexible action to cherry-pick commits from labeled pull requests
author: korthout
inputs:
branch_name:
description: >
Template used as the name for branches created by this action.
Placeholders can be used to define variable values.
These are indicated by a dollar sign and curly braces (`${placeholder}`).
Please refer to this action's README for all available placeholders.
default: backport-${pull_number}-to-${target_branch}
copy_assignees:
description: >
Controls whether to copy the assignees from the original pull request to the backport pull request.
Loading