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

Documentation update for RDC #511

Merged
merged 2 commits into from
May 15, 2024
Merged

Conversation

amullick007
Copy link
Contributor

No description provided.

@amullick007 amullick007 mentioned this pull request May 4, 2024
39 tasks
@calebofearth calebofearth added the documentation Improvements or additions to documentation label May 6, 2024
Copy link
Collaborator

@calebofearth calebofearth left a comment

Choose a reason for hiding this comment

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

Can you add tool versions for RDC analysis to the README?
EDIT: Looks like this was done.

Copy link
Contributor

@steph-morton steph-morton left a comment

Choose a reason for hiding this comment

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

Edits for style, clarity, punctuation, and typos.

docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
docs/CaliptraIntegrationSpecification.md Outdated Show resolved Hide resolved
calebofearth
calebofearth previously approved these changes May 9, 2024
steph-morton
steph-morton previously approved these changes May 9, 2024
@amullick007 amullick007 dismissed stale reviews from steph-morton and calebofearth via 348688a May 13, 2024 18:50
@calebofearth
Copy link
Collaborator

@amullick007 looks like you'll need to merge from main to resolve the conflict on pr_hash/pr_timestamp.
I'll see if I can make this requirement a bit less onerous as we work towards 2.0.

@amullick007
Copy link
Contributor Author

@amullick007 looks like you'll need to merge from main to resolve the conflict on pr_hash/pr_timestamp. I'll see if I can make this requirement a bit less onerous as we work towards 2.0.

I resolved the merge conflicts. Since I am not very familiar with Git, it took me few iterations to do this. Can you please check if the changes look good?

@calebofearth
Copy link
Collaborator

calebofearth commented May 13, 2024

@amullick007 looks like you'll need to merge from main to resolve the conflict on pr_hash/pr_timestamp. I'll see if I can make this requirement a bit less onerous as we work towards 2.0.

I resolved the merge conflicts. Since I am not very familiar with Git, it took me few iterations to do this. Can you please check if the changes look good?

Merge looks a little funky, but seems like you caught all the file updates so I think it's good.
Now that the fileset is updated you'll need to rerun stamp_repo.sh though, as the file hash has changed. Committing those updates shouldn't have any conflicts now.
EDIT: I see you did rerun the stamp script. We should be good. Thanks!

@calebofearth calebofearth self-requested a review May 13, 2024 22:03
@amullick007 amullick007 dismissed calebofearth’s stale review May 13, 2024 22:03

The merge-base changed after approval.

calebofearth
calebofearth previously approved these changes May 13, 2024
calebofearth
calebofearth previously approved these changes May 14, 2024
@amullick007 amullick007 dismissed calebofearth’s stale review May 14, 2024 17:09

The merge-base changed after approval.

@amullick007
Copy link
Contributor Author

All checks have passed, @steph-morton , @Nitsirks Can you please approve this PR.

Nitsirks
Nitsirks previously approved these changes May 14, 2024
@amullick007 amullick007 dismissed Nitsirks’s stale review May 14, 2024 17:54

The merge-base changed after approval.

@calebofearth
Copy link
Collaborator

@amullick007 any idea what's going on with all these merge-base messages? It seems like approvals are being auto-dismissed for no reason.

@amullick007
Copy link
Contributor Author

amullick007 commented May 14, 2024

@amullick007 any idea what's going on with all these merge-base messages? It seems like approvals are being auto-dismissed for no reason.

no idea :( shall I create a new PR? Even though I am seeing that only 1 pending reviewer is left. Once @steph-morton approves the review, lets see it it allows to merge

steph-morton
steph-morton previously approved these changes May 14, 2024
@amullick007 amullick007 dismissed steph-morton’s stale review May 14, 2024 18:12

The merge-base changed after approval.

@calebofearth
Copy link
Collaborator

@amullick007 any idea what's going on with all these merge-base messages? It seems like approvals are being auto-dismissed for no reason.

no idea :( shall I create a new PR? Even though I am seeing that only 1 pending reviewer is left. Once @steph-morton approves the review, lets see it it allows to merge

We may not need to abandon this PR just yet.
Give this set of command line operations a try. Assuming you have your forked repo checked out locally somewhere under the remote name 'origin' (which is default):

git switch main
git pull --ff-only
git reset --hard 7761460547e3cc36e59a6ecad457c3007f49fac7
git merge --no-commit --squash 40bd9eb6367a8cb3129074d4b951c1930952f84a
git commit -m "Squash replay of RDC documentation updates"
bash .github/scripts/stamp_repo.sh
git commit -m "Update stamps" -- .github/workflow_metadata/pr_hash .github/workflow_metadata/pr_timestamp
git push -f origin main:main

This should essentially start over from scratch and replay all your edits onto this same branch, then re-stamp it.
This will revert the merge from the chipsalliance main branch, which presumably is causing these merge-base issues.

@calebofearth calebofearth requested a review from Nitsirks May 14, 2024 19:38
@calebofearth
Copy link
Collaborator

Thanks for the fixups Avirup. Looks like it's good now. I'll merge once the checks finish.

@calebofearth calebofearth merged commit c6bdfd9 into chipsalliance:main May 15, 2024
56 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants