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

Add and use Mill wrapper script (backport #4119) #4125

Merged
merged 2 commits into from
May 31, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 31, 2024

This saves developers from having to install a dependency. It also allows us to drop an old Github Actions dependency that hasn't been updated in 2 years. This is the standard practice for projects using Mill on Github.

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

  • Internal or build-related (includes code refactoring/cleanup)

Desired Merge Strategy

  • Squash

Release Notes

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.

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

This saves developers from having to install a dependency. It also
allows us to drop an old Github Actions dependency that hasn't been
updated in 2 years. This is the standard practice for projects using
Mill on Github.

(cherry picked from commit 0f2efb5)

# Conflicts:
#	.github/workflows/test.yml
#	CONTRIBUTING.md
#	benchmark/src/main/scala/chisel3/benchmark/Benchmark.scala
@mergify mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels May 31, 2024
Copy link
Contributor Author

mergify bot commented May 31, 2024

Cherry-pick of 0f2efb5 has failed:

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

You are currently cherry-picking commit 0f2efb52a.
  (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:
	new file:   .mill-version
	new file:   mill

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/test.yml
	both modified:   CONTRIBUTING.md
	deleted by us:   benchmark/src/main/scala/chisel3/benchmark/Benchmark.scala

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-actions github-actions bot added the Internal Internal change, does not affect users, will be included in release notes label May 31, 2024
@chiselbot chiselbot merged commit dbbc578 into 6.x May 31, 2024
15 checks passed
@chiselbot chiselbot deleted the mergify/bp/6.x/pr-4119 branch May 31, 2024 18:26
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 Internal Internal change, does not affect users, will be included in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants