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

Merge master into 3.4.x (better mdoc, Apache license) #1605

Merged
merged 4 commits into from
Oct 5, 2020
Merged

Conversation

seldridge
Copy link
Member

Manual backport of #1601 to the 3.4.x branch. If 1601 changes (for whatever reason), this PR will need to be updated.

azidar and others added 2 commits September 24, 2020 10:00
* Fix broken mdoc

* Added test-chisel-docs to ci workflow
Change source and other relevant files to use SPDX license
LICENSE file moved from src/ to ./
Changed license file to refer to this per recommendation
using_spdx_license_list_short_identifiers

WARNING: Tests fail with as of yet undiagnosed error
```
[error] Failed: Total 691, Failed 19, Errors 0, Passed 672, Ignored 15
[error] Failed tests:
[error] 	chiselTests.QueueSpec
[error] 	examples.VendingMachineGeneratorSpec
[error] 	chiselTests.HarnessSpec
[error] 	chiselTests.ConnectSpec
[error] 	chiselTests.aop.SelectSpec
[error] 	chiselTests.PopCountSpec
[error] 	chiselTests.CloneModuleSpec
[error] (Test / test) sbt.TestsFailedException: Tests unsuccessful
[error] Total time: 379 s (06:19), completed Sep 30, 2020 12:38:17 AM
sbt:chisel3>
```
@seldridge seldridge requested a review from a team as a code owner October 5, 2020 19:08
@seldridge seldridge requested review from azidar and jackkoenig and removed request for a team and azidar October 5, 2020 19:08
@jackkoenig
Copy link
Contributor

We need to merge master to 3.4.x anyway to pick up the Apache licensing changes, so I think it'd be better to merge (squashing is fine) #1601 then just merge master to 3.4.x rather than doing a backport.

azidar and others added 2 commits October 5, 2020 19:29
* Fix broken mdoc

* Added test-chisel-docs to ci workflow

* Add requirement on build-treadle job

* Added forgotton colon

* Forgot cd into chisel3 dir

* moved three docs into explanations

* Updated reference

Co-authored-by: Schuyler Eldridge <schuyler.eldridge@gmail.com>
Signed-off-by: Schuyler Eldridge <schuyler.eldridge@sifive.com>
@seldridge seldridge changed the title Backport #1601 to 3.4.x Merge master into 3.4.x (better mdoc, Apache license) Oct 5, 2020
@seldridge
Copy link
Member Author

@jackkoenig: done!

Copy link
Contributor

@jackkoenig jackkoenig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI @chick

@jackkoenig jackkoenig added Merge with merge commit Please merge with a merge commit, do not squash and merg release issue labels Oct 5, 2020
@jackkoenig jackkoenig added this to the 3.4.0 milestone Oct 5, 2020
@chick chick merged commit d033d41 into 3.4.x Oct 5, 2020
@jackkoenig jackkoenig deleted the backport-1601 branch October 19, 2020 19:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Merge with merge commit Please merge with a merge commit, do not squash and merg release issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants