Skip to content

fix(gitlab): support Fast-forward merge #210

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

Merged
merged 2 commits into from
Jul 11, 2025
Merged

Conversation

aslafy-z
Copy link
Contributor

This changes allows detecting that the Release Pleaser PR is well merged.

As of today, it fails with "2025-07-10T15:24:08Z ERR failed to create pending releases: pull request is missing the merge commit".

Failing job: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/jobs/10639970620
Merged pull request: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/merge_requests/12
Merged pull request API view: https://gitlab.com/api/v4/projects/70582087/merge_requests/12
Landed commit: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/commit/29ac598d0bf7952a85f28ac5cf5d3e113069f7ae

This changes allows detecting that the Release Pleaser PR is well merged. 

As of today, it fails with "2025-07-10T15:24:08Z ERR failed to create pending releases: pull request is missing the merge commit".

Failing job: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/jobs/10639970620
Merged pull request: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/merge_requests/12 
Merged pull request API view: https://gitlab.com/api/v4/projects/70582087/merge_requests/12
Landed commit: https://gitlab.com/ccl-consulting/fleeting-plugin-scaleway/-/commit/29ac598d0bf7952a85f28ac5cf5d3e113069f7ae
@codecov-commenter
Copy link

codecov-commenter commented Jul 10, 2025

Codecov Report

Attention: Patch coverage is 0% with 6 lines in your changes missing coverage. Please review.

Project coverage is 24.72%. Comparing base (75fe90a) to head (09bf995).

Files with missing lines Patch % Lines
internal/forge/gitlab/gitlab.go 0.00% 6 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #210      +/-   ##
==========================================
- Coverage   24.75%   24.72%   -0.03%     
==========================================
  Files          22       22              
  Lines        1802     1804       +2     
==========================================
  Hits          446      446              
- Misses       1328     1330       +2     
  Partials       28       28              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Owner

@apricote apricote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much!

@apricote apricote merged commit bcca36e into apricote:main Jul 11, 2025
3 checks passed
@aslafy-z aslafy-z deleted the patch-1 branch July 11, 2025 10:02
apricote pushed a commit to hetznercloud/fleeting-plugin-hetzner that referenced this pull request Jul 11, 2025
…etznercloud/fleeting-plugin-hetzner!258)

This MR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [apricote/releaser-pleaser](https://gitlab.com/apricote/releaser-pleaser) | repository | patch | `v0.6.0` -> `v0.6.1` |

---

### Release Notes

<details>
<summary>apricote/releaser-pleaser (apricote/releaser-pleaser)</summary>

### [`v0.6.1`](https://gitlab.com/apricote/releaser-pleaser/blob/HEAD/CHANGELOG.md#v061)

[Compare Source](https://gitlab.com/apricote/releaser-pleaser/compare/v0.6.0...v0.6.1)

##### Bug Fixes

- **gitlab**: support fast-forward merges ([#&#8203;210](apricote/releaser-pleaser#210))

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever MR is behind base branch, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4zMC41IiwidXBkYXRlZEluVmVyIjoiNDEuMzAuNSIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOltdfQ==-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants