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

de-bump to sbt 1.9.7 (backport #3852) #3854

Merged
merged 2 commits into from
Feb 23, 2024
Merged

de-bump to sbt 1.9.7 (backport #3852) #3854

merged 2 commits into from
Feb 23, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 23, 2024

This is an automatic backport of pull request #3852 done by Mergify.
Cherry-pick of 0c9ebcc has failed:

On branch mergify/bp/6.x/pr-3852
Your branch is up to date with 'origin/6.x'.

You are currently cherry-picking commit 0c9ebccf8.
  (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:   project/build.properties

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   docs/src/installation.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


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


Original PR Body

Contributor Checklist

  • Did you add Scaladoc to every public function/method?
  • Did you add at least one test demonstrating the PR?
  • Did you delete any extraneous printlns/debugging code?
  • Did you specify the type of improvement?
  • Did you add appropriate documentation in docs/src?
  • Did you request a desired merge strategy?
  • Did you add text to be included in the Release Notes for this change?

Type of Improvement

I honestly have no idea which label to use

  • Dependency update

Desired Merge Strategy

  • Squash: The PR will be squashed and merged (choose this if you have no preference).

Release Notes

De-bumping to sbt 1.9.7 to avoid glibc issues for users, manifesting as:

java.lang.UnsatisfiedLinkError: Error looking up function 'stat': java: undefined symbol: stat

Reviewer Checklist (only modified by reviewer)

  • Did you add the appropriate labels? (Select the most appropriate one based on the "Type of Improvement")
  • Did you mark the proper milestone (Bug fix: 3.6.x, 5.x, or 6.x depending on impact, API modification or big change: 7.0)?
  • Did you review?
  • Did you check whether all relevant Contributor checkboxes have been checked?
  • Did you do one of the following when ready to merge:
    • Squash: You/ the contributor Enable auto-merge (squash), clean up the commit message, and label with Please Merge.
    • Merge: Ensure that contributor has cleaned up their commit history, then merge with Create a merge commit.

(cherry picked from commit 0c9ebcc)

# Conflicts:
#	docs/src/installation.md
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Feb 23, 2024
@github-actions github-actions bot added the Dependency Update Updates a dependency, will be included in release notes label Feb 23, 2024
@chiselbot chiselbot merged commit 617d31d into 6.x Feb 23, 2024
15 checks passed
@chiselbot chiselbot deleted the mergify/bp/6.x/pr-3852 branch February 23, 2024 01:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport Automated backport, please consider for minor release Dependency Update Updates a dependency, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants