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

[8.14] ci(release): update descriptions and use oblt-actions@v1 (backport #13529) #13532

Merged
merged 3 commits into from
Jul 1, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 1, 2024

Motivation/summary

  • Use v1 version for oblt-actions
  • Use oblt-actions rather than apm-pipeline-library <-- it's now deprecated
  • Update the description so it explicitly explains the expected input parameter.

The release.mk is the one in charge of doing the auto-bump:

  • for the patch release:
    NEXT_RELEASE ?= $(RELEASE_BRANCH).$(shell expr $(PROJECT_PATCH_VERSION) + 1)
  • for the minor release:
    NEXT_PROJECT_MINOR_VERSION ?= $(PROJECT_MAJOR_VERSION).$(shell expr $(PROJECT_MINOR_VERSION) + 1).0

Further details

  • .github/workflows/run-patch-release.yml should be run using the main branch and the version to be released.
  • .github/workflows/run-minor-release.yml should be run using the main branch and the current version in main.

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


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

(cherry picked from commit daf2ef9)

# Conflicts:
#	.github/workflows/run-patch-release.yml
#	dev_docs/RELEASES.md
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jul 1, 2024
@mergify mergify bot assigned v1v Jul 1, 2024
Copy link
Contributor Author

mergify bot commented Jul 1, 2024

Cherry-pick of daf2ef9 has failed:

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

You are currently cherry-picking commit daf2ef90d.
  (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)

Changes to be committed:
	modified:   .github/workflows/prepare-release/action.yml
	modified:   .github/workflows/run-minor-release.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/run-patch-release.yml
	both modified:   dev_docs/RELEASES.md

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

.github/workflows/run-patch-release.yml Outdated Show resolved Hide resolved
.github/workflows/run-patch-release.yml Outdated Show resolved Hide resolved
dev_docs/RELEASES.md Outdated Show resolved Hide resolved
dev_docs/RELEASES.md Outdated Show resolved Hide resolved
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Jul 1, 2024
@mergify mergify bot merged commit 3477854 into 8.14 Jul 1, 2024
16 checks passed
@mergify mergify bot deleted the mergify/bp/8.14/pr-13529 branch July 1, 2024 13:58
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.

1 participant