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

ci(deps): don't add filename to deps.lock hash (backport #6032) #6034

Merged
merged 4 commits into from
Feb 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2023

This is an automatic backport of pull request #6032 done by Mergify.
Cherry-pick of 15cc640 has failed:

On branch mergify/bp/release-2.0/pr-6032
Your branch is up to date with 'origin/release-2.0'.

You are currently cherry-picking commit 15cc6407a.
  (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/rm <file>..." as appropriate to mark resolution)
	both modified:   mk/dependencies/deps.lock
	deleted by us:   tools/dev/install-dev-tools.sh

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

The filename was causing issues depending on where the sub folder is

Signed-off-by: Charly Molter <charly.molter@konghq.com>
(cherry picked from commit 15cc640)

# Conflicts:
#	mk/dependencies/deps.lock
#	tools/dev/install-dev-tools.sh
@mergify mergify bot requested a review from a team as a code owner February 14, 2023 17:19
@mergify mergify bot added the conflicts label Feb 14, 2023
@lahabana lahabana added the ci/skip-test PR: Don't run unit and e2e tests (maybe this is just a doc change) label Feb 14, 2023
@lahabana
Copy link
Contributor

/format

Signed-off-by: Charly Molter <charly.molter@konghq.com>
Signed-off-by: Charly Molter <charly.molter@konghq.com>
@lahabana lahabana enabled auto-merge (squash) February 14, 2023 18:05
Signed-off-by: Charly Molter <charly.molter@konghq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/skip-test PR: Don't run unit and e2e tests (maybe this is just a doc change) conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant