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.

Sign up for GitHub

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

Jump to bottom

Update Scala CLI Template #3757

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Update Scala CLI Template #3757

merged 1 commit into from
Jan 22, 2024

Conversation

jackkoenig
Copy link
Contributor

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

  • Use "dep" instead of deprecated "lib"
  • Move ChiselStage import above import chisel3._
    • This makes users less likely to run into issues adding import chisel3.util._
  • Bump versions in Github workflows

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.5.x, 3.6.x, or 5.x depending on impact, API modification or big change: 6.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.

@jackkoenig jackkoenig added the Internal Internal change, does not affect users, will be included in release notes label Jan 22, 2024
@jackkoenig jackkoenig requested a review from seldridge January 22, 2024 19:12
@jackkoenig jackkoenig added this to the 3.6.x milestone Jan 22, 2024
@jackkoenig jackkoenig mentioned this pull request Jan 22, 2024
Merged
14 tasks
@jackkoenig
Update Scala CLI Template
c4966f9 
* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows
@jackkoenig jackkoenig merged commit 589f106 into main Jan 22, 2024
14 checks passed
@jackkoenig jackkoenig deleted the update-template branch January 22, 2024 23:33
@mergify mergify bot added the Backported This PR has been backported label Jan 22, 2024
mergify bot pushed a commit that referenced this pull request Jan 22, 2024
@jackkoenig @mergify
Update Scala CLI Template (#3757)
4172165 
* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows

(cherry picked from commit 589f106)

# Conflicts:
#	.github/workflows/build-scala-cli-template.yml
#	.github/workflows/build-scala-cli-template/chisel-template.scala
@mergify mergify bot mentioned this pull request Jan 22, 2024
Merged
14 tasks
mergify bot pushed a commit that referenced this pull request Jan 22, 2024
@jackkoenig @mergify
Update Scala CLI Template (#3757)
1a47443 
* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows

(cherry picked from commit 589f106)

# Conflicts:
#	.github/workflows/build-scala-cli-template.yml
#	.github/workflows/build-scala-cli-template/chisel-template.scala
@mergify mergify bot mentioned this pull request Jan 22, 2024
Merged
14 tasks
mergify bot added a commit that referenced this pull request Jan 23, 2024
@mergify @jackkoenig
Update Scala CLI Template (backport #3757) (#3759)
5223212 
* Update Scala CLI Template (#3757)

* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows

(cherry picked from commit 589f106)

# Conflicts:
#	.github/workflows/build-scala-cli-template.yml
#	.github/workflows/build-scala-cli-template/chisel-template.scala

* Resolve backport conflicts

---------

Co-authored-by: Jack Koenig <[email protected]>
mergify bot added a commit that referenced this pull request Jan 23, 2024
@mergify @jackkoenig
Update Scala CLI Template (backport #3757) (#3758)
9d964e9 
* Update Scala CLI Template (#3757)

* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows

(cherry picked from commit 589f106)

# Conflicts:
#	.github/workflows/build-scala-cli-template.yml
#	.github/workflows/build-scala-cli-template/chisel-template.scala

* Resolve backport conflicts

---------

Co-authored-by: Jack Koenig <[email protected]>
@jackkoenig
Copy link
Contributor Author

@Mergifyio backport 6.x

@mergify Mergify
Copy link
Contributor

mergify bot commented Feb 23, 2024 •
edited
Loading

backport 6.x

✅ Backports have been created

@jackkoenig
Copy link
Contributor Author

Somehow this didn't get backported to 6.x, it may have occurred just after 6.0.0 was released but before the backporting flow was set up properly.

mergify bot pushed a commit that referenced this pull request Feb 23, 2024
@jackkoenig @mergify
Update Scala CLI Template (#3757)
942515b 
* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows

(cherry picked from commit 589f106)
@mergify mergify bot mentioned this pull request Feb 23, 2024
Merged
14 tasks
chiselbot pushed a commit that referenced this pull request Feb 23, 2024
@mergify @jackkoenig
Update Scala CLI Template (#3757) (#3861)
4e42f70 
* Use "dep" instead of deprecated "lib"
* Add _root_ to `import circt.stage.ChiselStage`
  * Also add comment describing how this disambiguates from
    chisel3.util.circt when the user does `import chisel3.util._`
* Bump versions in Github workflows

(cherry picked from commit 589f106)

Co-authored-by: Jack Koenig <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azidar azidar azidar left review comments

@mwachs5 mwachs5 mwachs5 left review comments

@seldridge seldridge seldridge approved these changes

Assignees
No one assigned
Labels
Backported This PR has been backported Internal Internal change, does not affect users, will be included in release notes
Projects
None yet
Milestone
3.6.x
Development

Successfully merging this pull request may close these issues.
4 participants
@jackkoenig @seldridge @azidar @mwachs5