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 cryptol-verifier into saw-core repository. #805

Merged
merged 1 commit into from
Aug 7, 2020

Conversation

brianhuffman
Copy link
Contributor

This is a PR that adapts saw-script to GaloisInc/saw-core#62, which renames the cryptol-verifier package to cryptol-saw-core and moves it into the saw-core repository.

@brianhuffman brianhuffman marked this pull request as draft August 7, 2020 02:47
@brianhuffman
Copy link
Contributor Author

This PR builds on top of #804, so we will keep this marked as draft until that one is merged.

Copy link
Contributor

@andreistefanescu andreistefanescu left a comment

Choose a reason for hiding this comment

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

👍

@brianhuffman
Copy link
Contributor Author

brianhuffman commented Aug 7, 2020

I just rebased onto the post-#804-merge master branch; will be ready to merge when the CI tests finish.

@brianhuffman brianhuffman marked this pull request as ready for review August 7, 2020 14:10
@brianhuffman
Copy link
Contributor Author

From the CI results it looks like the submodule deletion was messed up by a rebase. I'll redo it and try again.

@brianhuffman brianhuffman force-pushed the combine-repos branch 2 times, most recently from 6688153 to 465ae82 Compare August 7, 2020 16:36
Package `cryptol-verifier` is now called `cryptol-saw-core`, and it
has moved into a subdirectory within the `saw-core` repository.

Update cabal.project and stack.yaml files with new package locations.

Remove redundant `cryptol-verifier` submodule.
@brianhuffman brianhuffman merged commit 2cd350b into master Aug 7, 2020
@brianhuffman brianhuffman deleted the combine-repos branch November 18, 2020 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants