From 621b8fff5dcd8ad481fd151c8e0fea6e7438d070 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 16 Apr 2024 11:41:21 +0200
Subject: Run sanity checks in CI only

---
 Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0f3e2999..0299d134 100644
--- a/Makefile
+++ b/Makefile
@@ -31,9 +31,8 @@ AENEAS_EXE ?= bin/aeneas
 
 # The user can specify additional translation options for Aeneas.
 # By default we activate the (expensive) sanity checks.
-OPTIONS ?= -checks
+OPTIONS ?=
 
-#
 # The rules use (and update) the following variables
 #
 # The Charon test directory where to look for the .llbc files
-- 
cgit v1.2.3


From cfda3a990cb3b24d91ce5bf8d1ddec7b265beca5 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 16 Apr 2024 13:30:03 +0200
Subject: Ensure we regenerate files properly in CI

Files that weren't regenerated were marked as not
automatically-generated.
---
 Makefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 0299d134..dbc78f9f 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ doc:
 	cd compiler && dune build @doc
 
 .PHONY: clean
-clean:
+clean: clean-generated
 	cd compiler && dune clean
 
 # Test the project by translating test files to F*
@@ -99,6 +99,11 @@ test-all: test-no_nested_borrows test-paper \
 	test-loops \
 	test-arrays test-traits test-bitwise test-demo
 
+.PHONY: clean-generated
+clean-generated:
+	# We can't put this line in `tests/Makefile` otherwise it will detect itself :D
+	grep -lR 'THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS' tests | xargs rm
+
 # Verify the F* files generated by the translation
 .PHONY: verify
 verify:
-- 
cgit v1.2.3


From 04f65cb173978ac9010ae88a24e6106382669fa1 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Thu, 18 Apr 2024 11:26:51 +0200
Subject: Address review comments

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index dbc78f9f..4ecc2a3e 100644
--- a/Makefile
+++ b/Makefile
@@ -101,8 +101,9 @@ test-all: test-no_nested_borrows test-paper \
 
 .PHONY: clean-generated
 clean-generated:
-	# We can't put this line in `tests/Makefile` otherwise it will detect itself :D
-	grep -lR 'THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS' tests | xargs rm
+	# We can't put this line in `tests/Makefile` otherwise it will detect itself.
+	# FIXME: generation of hol4 files is deactivated so we don't delete those.
+	grep -lR 'THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS' tests | grep -v '^tests/hol4' | xargs rm
 
 # Verify the F* files generated by the translation
 .PHONY: verify
-- 
cgit v1.2.3


From 40e797fbf4d7bb47ef48597f25fda4e0b78633c7 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Mon, 22 Apr 2024 11:55:55 +0200
Subject: ci: check code formatting

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 4ecc2a3e..08359d49 100644
--- a/Makefile
+++ b/Makefile
@@ -113,7 +113,8 @@ verify:
 # Reformat the project
 .PHONY: format
 format:
-	cd compiler && dune build @fmt --auto-promote
+	@# `|| `true` because the command returns an error if it changed anything, which we don't care about.
+	cd compiler && dune fmt || true
 
 # The commands to run Charon to generate the .llbc files
 ifeq (, $(REGEN_LLBC))
-- 
cgit v1.2.3