Skip to content

add yaml related pre-commit hooks #295

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
Merged
merged 3 commits into from
Dec 11, 2024
Merged

add yaml related pre-commit hooks #295

merged 3 commits into from
Dec 11, 2024

Conversation

@kbroch-rivosinc
Copy link
Collaborator

@kbroch-rivosinc kbroch-rivosinc commented Nov 20, 2024 •
edited
Loading

relates to #260

wait till PR #266 and #294 lands.

@kbroch-rivosinc kbroch-rivosinc marked this pull request as draft November 20, 2024 21:24
kbroch-rivosinc added a commit that referenced this pull request Nov 20, 2024
@kbroch-rivosinc
autofix from pre-commit run --all-files prettier
c8bacaa 
relates to #260

NOTE: has json changes from #295 as well
@kbroch-rivosinc kbroch-rivosinc force-pushed the dev/kbroch/yaml-pre-commit branch from c8bacaa to c0195b9 Compare December 10, 2024 21:40
@kbroch-rivosinc kbroch-rivosinc self-assigned this Dec 10, 2024
@kbroch-rivosinc kbroch-rivosinc marked this pull request as ready for review December 10, 2024 21:41
@kbroch-rivosinc kbroch-rivosinc marked this pull request as draft December 10, 2024 21:47
@kbroch-rivosinc kbroch-rivosinc force-pushed the dev/kbroch/yaml-pre-commit branch from c0195b9 to 8dfe356 Compare December 10, 2024 23:29
@kbroch-rivosinc kbroch-rivosinc force-pushed the dev/kbroch/yaml-pre-commit branch from 0f5f465 to 62a82ac Compare December 11, 2024 21:17
@kbroch-rivosinc kbroch-rivosinc marked this pull request as ready for review December 11, 2024 21:41
@dhower-qc dhower-qc merged commit 33b5934 into main Dec 11, 2024
9 checks passed
@dhower-qc dhower-qc deleted the dev/kbroch/yaml-pre-commit branch December 11, 2024 21:52
@ShashankVM
Copy link
Collaborator

ShashankVM commented Dec 22, 2024 •
edited
Loading

Hi @kbroch-rivosinc , @dhower-qc please note that this PR has overwritten my file change in arch/inst/F/fadd.s.yaml via my PR: https://github.com/riscv-software-src/riscv-unified-db/pull/334/files.

Screenshot attached below for your reference, see lines 29-30. These lines have been removed by this PR

  • Before this PR got merged:

screenshot-unified_db_pr

  • After this PR got merged:

Screenshot_unified_db_after

kbroch-rivosinc added a commit that referenced this pull request Dec 22, 2024
@kbroch-rivosinc
Fix wrong merge conflict resolution on #295 that overwrote change for #…
c3e697b 
…334

Brought up here: #295 (comment)
@kbroch-rivosinc kbroch-rivosinc mentioned this pull request Dec 22, 2024
Merged
@kbroch-rivosinc
Copy link
Collaborator Author

kbroch-rivosinc commented Dec 22, 2024

Hi @kbroch-rivosinc , @dhower-qc please note that this PR has overwritten my file change in arch/inst/F/fadd.s.yaml via my PR: https://github.com/riscv-software-src/riscv-unified-db/pull/334/files.

Looks accidental in that a merge conflict was resolved differently https://github.com/riscv-software-src/riscv-unified-db/pull/295/files#diff-7a92913cf5c64263aa47e0816cae702ce9c54950ea0227fcc2d74c6d19f5d946L29

I've put potential PR into fix this here: https://github.com/riscv-software-src/riscv-unified-db/pull/374/files

@ShashankVM
Copy link
Collaborator

ShashankVM commented Dec 23, 2024

Thank you, @kbroch-rivosinc !

kbroch-rivosinc added a commit that referenced this pull request Jan 7, 2025
@kbroch-rivosinc
Fix wrong merge conflict resolution on #295 that overwrote change for #…
9b74539 
…334

Brought up here: #295 (comment)
kbroch-rivosinc added a commit that referenced this pull request Jan 8, 2025
@kbroch-rivosinc
Merge pull request #374 from riscv-software-src/dev/kbroch/fix-pr-295…
7fd62e6 
…-overwrite-pr-334

Fix merge conflict resolve on #295 that overwrote change for #334
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dhower-qc dhower-qc dhower-qc approved these changes

Assignees

@kbroch-rivosinc kbroch-rivosinc

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@kbroch-rivosinc @ShashankVM @dhower-qc