actions/git-backporting
1
0
Fork 0
mirror of https://code.forgejo.org/actions/git-backporting.git synced 2025-02-23 02:55:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
95 commits 3 branches 27 tags 2 MiB
Commit graph

95 commits

This branch
This branch
All branches
Author SHA1 Message Date
github-actions[bot]
c5d7f0ea56
chore: release v4.8.1 (#132) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2024-07-16 19:27:31 +02:00
Andrea Lamparelli
cb3473d7c9
fix(gh130): apply commits in the correct order on github (#131) 2024-07-16 17:49:23 +02:00
dependabot[bot]
da6431b114
build(deps-dev): bump braces from 3.0.2 to 3.0.3 (#129) 
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-21 14:05:07 +02:00
github-actions[bot]
c22286f85e
chore: release v4.8.0 (#128) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2024-04-11 08:44:11 +02:00
Andrea Lamparelli
2bb7f73112
feat: implement error notification as pr comment (#124) 
* feat: implement error notification as pr comment

* Update action.yml

Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>

* feat: implement gitlab client and surround with try catch

* docs: add error notification enablment in the doc

* feat: disable comment if dry-run

* feat: update the default comment on error

---------

Co-authored-by: Earl Warren <109468362+earl-warren@users.noreply.github.com>
 2024-04-10 23:01:16 +02:00
Earl Warren
6042bcc40b
feat: auto-detect the value of the no-squash option (#118) 
The auto-no-squash option is added to:

* backport all the commits when the pull/merge request has been merged
* backport the squashed commit otherwise

It is equivalent to dynamically adjust the value of the no-squash
option, depending on the context.

The no-squash option is kept for backward compatibility for a single
use case: backporting the merged commit instead of backporting the
commits of the pull/merge request request.

Detecting if a pull/merge request was squashed or not depends on the
underlying forge:

* Forgejo / GitHub: use the API to count the number of parents
* GitLab: if the squash_commit_sha is set, the merge request was
  squashed

If the pull/merge request is open, always backport all the commits it
contains.

Fixes: https://github.com/kiegroup/git-backporting/issues/113

Co-authored-by: Andrea Lamparelli <a.lamparelli95@gmail.com>
 2024-04-08 18:51:13 +02:00
github-actions[bot]
fc5dba6703
chore: release v4.7.1 (#122) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2024-04-03 10:32:37 +02:00
Earl Warren
e6f86f8f83
fix: gha input is target-branch-pattern, not target-reg-exp (#120) 2024-04-03 08:44:29 +02:00
github-actions[bot]
0a07bf30c8
chore: release v4.7.0 (#117) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2024-04-02 11:23:43 +02:00
Earl Warren
6d9b9db590
fix: return GitHub no-squash commits in order (#115) 
Fixes: https://github.com/kiegroup/git-backporting/issues/114
 2024-04-02 11:17:41 +02:00
Earl Warren
fe6be83074
feat: add --cherry-pick-options to add to all cherry-pick run (#116) 
Fixes: https://github.com/kiegroup/git-backporting/issues/111
 2024-04-02 10:34:48 +02:00
Andrea Lamparelli
53cc505f17
feat(gh75): extract target branched from pr labels (#112) 2024-03-30 19:19:17 +01:00
Earl Warren
b2e2e271b9
docs: explain the strategy equivalent to the cherry-pick defaults (#110) 2024-03-30 11:04:32 +01:00
Andrea Lamparelli
ee7a87f26f
docs: remove migrating section (#109) 2024-03-29 09:39:39 +01:00
dependabot[bot]
b30ba6021a
build(deps-dev): bump express from 4.18.2 to 4.19.2 (#108) 
Bumps [express](https://github.com/expressjs/express) from 4.18.2 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.2...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-03-28 19:51:30 +01:00
github-actions[bot]
ffe625d8b3
chore: release v4.6.0 (#107) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2024-03-25 09:30:30 +01:00
Earl Warren
80a0b554f0
feat: add --git-client to explicitly set the type of forge (#106) 
codeberg is running Forgejo and it may not be possible to infer that
from the URL alone. The same is true for GitHub Enterprise Server.
 2024-03-23 17:13:14 +01:00
dependabot[bot]
646d8fe41c
build(deps): bump follow-redirects from 1.15.4 to 1.15.6 (#104) 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.4 to 1.15.6.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.4...v1.15.6)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-03-22 16:06:11 +01:00
Earl Warren
a36b740991
docs: fix typos (#105) 
Signed-off-by: Earl Warren <contact@earl-warren.org>
 2024-03-22 16:04:20 +01:00
github-actions[bot]
f4a2683189
chore: release v4.5.2 (#103) 
* chore: release v4.5.2

* Update CHANGELOG.md

---------

Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
Co-authored-by: Andrea Lamparelli <a.lamparelli95@gmail.com>
 2024-03-08 12:51:25 +01:00
Andrea Lamparelli
c8ede8d4e2
build: upgrade to node20 for gha (#102) 2024-03-07 09:35:08 +01:00
github-actions[bot]
bce5dd4f99
chore: release v4.5.1 (#101) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2024-02-23 15:29:56 +01:00
Andrea Lamparelli
c57fca6bd6
fix(gh-96): fix git token parsing (#98) 2024-02-23 15:13:34 +01:00
Andrea Lamparelli
2c5c54654d
build: skip ci when not required (#100) 2024-02-23 11:50:56 +01:00
Andrea Lamparelli
5afc464268
chore: add issue templates and improve pr template (#99) 2024-02-23 11:44:47 +01:00
Ratchanan Srirattanamet
9bcd6e6b55
fix: --auth when --git-user contains space (#95) 
Since --git-user is a user-facing name, it's common to include a space
in it. As such, it's not suitable to use as a username in a Git remote
URL.

GitLab documented that it doesn't (yet?) check for username [1], and
from my testing GitHub doesn't seem to care either. So just use an
arbitrary name as a username.

[1] https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html
 2024-02-23 10:30:18 +01:00
Andrea Lamparelli
d4dc510af1
build: upgrade release-it (#94) 2024-02-20 14:41:12 +01:00
Ratchanan Srirattanamet
300fa91a8a
fix: --no-squash on single-commit GitLab MR (#93) 
Due to off-by-one error in GitLabMapper, --no-squash was not effective
on an MR containing single commit. Fix by using the same condition as
GitHubMapper.
 2024-02-20 14:24:08 +01:00
dependabot[bot]
b7df1f80dc
build(deps): bump follow-redirects from 1.15.2 to 1.15.4 (#92) 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.2 to 1.15.4.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.2...v1.15.4)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-01-11 10:01:35 +01:00
github-actions[bot]
204ebd4376
chore: release v4.5.0 (#89) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2023-12-10 23:18:55 +01:00
Andrea Lamparelli
70da575afc
feat(gh-85): take git tokens from environment (#88) 2023-12-10 22:05:53 +01:00
github-actions[bot]
aac73bf7c5
chore: release v4.4.1 (#87) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2023-12-05 16:25:50 +01:00
Shyim
ed32d2275b
fix: namespace parsing in gitlab (#84) 
* fix: namespace parsing in gitlab

* test: add test for nested namespace

---------

Co-authored-by: Andrea Lamparelli <a.lamparelli95@gmail.com>
 2023-12-05 16:08:49 +01:00
dependabot[bot]
e7c9b4795b
build(deps): bump axios from 1.4.0 to 1.6.0 (#83) 
Bumps [axios](https://github.com/axios/axios) from 1.4.0 to 1.6.0.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v1.4.0...v1.6.0)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-11-11 22:33:56 +01:00
dependabot[bot]
2db9eb3ef2
build(deps-dev): bump @babel/traverse from 7.22.5 to 7.23.2 (#82) 
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.5 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2023-10-19 11:56:17 +02:00
github-actions[bot]
4313be48e7
chore: release v4.4.0 (#81) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2023-08-18 13:24:39 +02:00
Andrea Lamparelli
9f0fbc0b2f
feat: integrate with codeberg (#80) 2023-08-18 13:15:38 +02:00
Andrea Lamparelli
eecbff34b7
chore: update README (#79) 2023-08-18 13:11:20 +02:00
Andrea Lamparelli
5fc72e127b
feat(issue-77): handle multiple target branches (#78) 
fix: https://github.com/kiegroup/git-backporting/issues/77

This enhancement allow users to backport the same change to multiple
branches with one single tool invocation
 2023-08-03 21:57:11 +02:00
github-actions[bot]
c19a56a9ad
chore: release v4.3.0 (#74) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2023-07-27 17:45:18 +02:00
Andrea Lamparelli
29589a63b5
fix: gha skip whitespace trim on body (#73) 
this also added a github workflow example
 2023-07-27 17:38:45 +02:00
Andrea Lamparelli
fa43ffc1dc
fix: preserve new lines in body and comments (#72) 2023-07-27 15:35:23 +02:00
Andrea Lamparelli
a402fa4525
Merge pull request #71 from lampajr/issue-70_post_comments 
feat(issue-70): additional pr comments
 2023-07-27 14:26:12 +02:00
Andrea Lamparelli
bed7e29ddc feat(issue-70): additional pr comments 2023-07-27 12:36:42 +02:00
Andrea Lamparelli
10a46551ee refactor: move backport data generation to configs parser 2023-07-27 11:26:39 +02:00
Andrea Lamparelli
e13d1fbf00 docs: update readme 2023-07-20 15:45:17 +02:00
Andrea Lamparelli
9766bdb67b
build(CVE-2023-37466): update release-it to 16.1.3 (#68) 
Fix CVE-2023-37466: vm2 Sandbox Escape vulnerability
 2023-07-20 15:19:11 +02:00
Andrea Lamparelli
cee5e32d0e
ci: automated pull request test coverage report (#66) 2023-07-20 10:21:22 +02:00
Andrea Lamparelli
a8db0755a8
refactor: updated logging messages (#65) 2023-07-20 10:05:07 +02:00
github-actions[bot]
e29dae5073
chore: release v4.2.0 (#64) 
Co-authored-by: Create or Update Pull Request Action <create-or-update-pull-request@users.noreply.github.com>
 2023-07-13 10:10:47 +02:00