Skip to content
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

[7.17] ci(release-minor): add apm- prefix and create release diff between patches (backport #13065) #13087

Merged
merged 2 commits into from
May 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 7, 2024

Motivation/summary

Support release automation for FF with:

  • adding apm- prefix to Asciidoc links and targets
  • using tags instead of branches in compare links

Test

$  make rename-changelog RELEASE_BRANCH=8.15 RELEASE_VERSION=8.15.0 VERSION=8.15
>> common-changelog
>> rename-changelog

produced:

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 623bc75af..dffd289c9 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -1,4 +1,5 @@
 // tag::list[]
+* <<apm-release-notes-8.15>>
 * <<apm-release-notes-8.14>>
 * <<apm-release-notes-8.13>>
 * <<apm-release-notes-8.12>>
@@ -18,6 +19,7 @@
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.15.asciidoc[]
 include::./changelogs/8.14.asciidoc[]
 include::./changelogs/8.13.asciidoc[]
 include::./changelogs/8.12.asciidoc[]
diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
index a3cf1bf26..52107f228 100644
--- a/changelogs/head.asciidoc
+++ b/changelogs/head.asciidoc
@@ -1,7 +1,7 @@
 [[release-notes-head]]
 == APM version HEAD
 
-https://github.com/elastic/apm-server/compare/8.14\...main[View commits]
+https://github.com/elastic/apm-server/compare/8.15\...main[View commits]
 
 [float]
 ==== Breaking Changes

and

[[apm-release-notes-8.15]]
== APM version 8.15
* <<apm-release-notes-8.15.0>>

[float]
[[apm-release-notes-8.15.0]]
=== APM version 8.15.0

https://github.com/elastic/apm-server/compare/v8.13.2\...v8.15.0[View commits]

[float]
==== Breaking Changes

[float]
==== Deprecations

[float]
==== Intake API Changes

[float]
==== Added

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

Behaviour changed in #12820

Part of #12989


This is an automatic backport of pull request #13065 done by [Mergify](https://mergify.com).

…patches (#13065)

(cherry picked from commit 1f2c64e)

# Conflicts:
#	release.mk
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 7, 2024
@mergify mergify bot assigned v1v May 7, 2024
Copy link
Contributor Author

mergify bot commented May 7, 2024

Cherry-pick of 1f2c64e has failed:

On branch mergify/bp/7.17/pr-13065
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 1f2c64ea7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   release.mk

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

release.mk Outdated Show resolved Hide resolved
@v1v v1v removed the conflicts There is a conflict in the backported pull request label May 7, 2024
@mergify mergify bot merged commit bd90f95 into 7.17 May 7, 2024
12 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-13065 branch May 7, 2024 13:02
@v1v
Copy link
Member

v1v commented May 7, 2024

I guess this is not relevant for 7.17 since no minor but patches releases. But Keeping the same content can help in the future if any backports are needed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant