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

Rename Scala CLI template to example (backport #3917) #3918

Merged
merged 2 commits into from
Mar 7, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 7, 2024

This is an automatic backport of pull request #3917 done by Mergify.
Cherry-pick of bb3c640 has failed:

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

You are currently cherry-picking commit bb3c6406f.
  (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:
	deleted:    .github/workflows/build-scala-cli-template/action.yml
	deleted:    .github/workflows/build-scala-cli-template/chisel-template.scala
	new file:   .github/workflows/scala-cli-example.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/build-scala-cli-example.yml
	added by us:     .github/workflows/build-scala-cli-example/action.yml
	both modified:   .github/workflows/build-scala-cli-example/chisel-example.scala
	deleted by them: .github/workflows/scala-cli-template.yml
	both modified:   .github/workflows/test.yml
	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

This avoids name aliasing with the chisel-template repository.

As part of this, I will manually add chisel-example.scala to existing releases that currently have chisel-template.scala

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

  • Documentation or website-related

Desired Merge Strategy

  • Squash

Release Notes

Existing links to https://github.com/chipsalliance/chisel/releases/latest/download/chisel-template.scala should instead use https://github.com/chipsalliance/chisel/releases/latest/download/chisel-example.scala

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 avoids name aliasing with the chisel-template repository.

---------

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
(cherry picked from commit bb3c640)

# Conflicts:
#	.github/workflows/build-scala-cli-example.yml
#	.github/workflows/build-scala-cli-example/action.yml
#	.github/workflows/build-scala-cli-example/chisel-example.scala
#	.github/workflows/scala-cli-template.yml
#	.github/workflows/test.yml
#	docs/src/installation.md
Copy link
Contributor Author

mergify bot commented Mar 7, 2024

Cherry-pick of bb3c640 has failed:

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

You are currently cherry-picking commit bb3c6406f.
  (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:
	deleted:    .github/workflows/build-scala-cli-template/action.yml
	deleted:    .github/workflows/build-scala-cli-template/chisel-template.scala
	new file:   .github/workflows/scala-cli-example.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/build-scala-cli-example.yml
	added by us:     .github/workflows/build-scala-cli-example/action.yml
	both modified:   .github/workflows/build-scala-cli-example/chisel-example.scala
	deleted by them: .github/workflows/scala-cli-template.yml
	both modified:   .github/workflows/test.yml
	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 mergify bot added Backport Automated backport, please consider for minor release bp-conflict labels Mar 7, 2024
@github-actions github-actions bot added the Documentation Only changing documentation label Mar 7, 2024
@chiselbot chiselbot merged commit 60ebc65 into 3.6.x Mar 7, 2024
15 checks passed
@chiselbot chiselbot deleted the mergify/bp/3.6.x/pr-3917 branch March 7, 2024 23:42
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 Documentation Only changing documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants