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

Some assorted fixes #2839

Merged
merged 20 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
*.fst linguist-documentation=false
*.fsti linguist-language=FStar
*.fsti linguist-documentation=false
/src/ocaml-output/FStar_*.ml linguist-vendored
/ocaml/fstar-lib/generated/FStar_*.ml linguist-vendored
/ocaml/*/generated/*.ml linguist-vendored

# Line endings
*.fs* eol=lf
Expand All @@ -23,10 +22,8 @@ karamel_ref eol=lf
# Do not shows diff nor try to merge for the OCaml snapshot and hint
# files. This just takes the latest one when there's a conflict, and
# does not show diffs in the CLI nor GitHub.
/src/ocaml-output/FStar_*.ml -diff -merge
/src/ocaml-output/FStar_*.ml linguist-generated=true
/ocaml/fstar-lib/generated/FStar_*.ml -diff -merge
/ocaml/fstar-lib/generated/FStar_*.ml linguist-generated=true
/ocaml/*/generated/*.ml -diff -merge
/ocaml/*/generated/*.ml linguist-generated=true
*.hints -diff -merge
*.hints linguist-generated=true

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ ci-uregressions-ulong:
1: dune-fstar

2:
+$(MAKE) -C src/ocaml-output generated-files
+$(MAKE) -C src ocaml
+$(MAKE) dune-fstar

3:
+$(MAKE) dune-fstar
+$(MAKE) -C src ocaml
+$(MAKE) dune-fstar
+$(MAKE) 1
+$(MAKE) 2
Loading