From 80526fc4717d56106a6c62ef0650a30c647a18e9 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 16:40:43 +0200 Subject: [PATCH 01/11] add weekly workflow --- .github/workflows/weekly.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .github/workflows/weekly.yml diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml new file mode 100644 index 000000000..bb639dc19 --- /dev/null +++ b/.github/workflows/weekly.yml @@ -0,0 +1,16 @@ +on: + schedule: + - cron: '0 0 * * 0' + workflow_dispatch: + +jobs: + default: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: ocaml/setup-ocaml@v3 + with: + ocaml-compiler: 4.13.1 + - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir + - run: make -j4 + - run: make test From f6324a77f3c2b851932a9c1f63d0e27ede791eeb Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 16:44:29 +0200 Subject: [PATCH 02/11] temporarily enable workflow for pull requests --- .github/workflows/weekly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index bb639dc19..59e166b95 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -2,6 +2,7 @@ on: schedule: - cron: '0 0 * * 0' workflow_dispatch: + pull_request: jobs: default: From 50d8a6c8c8bae9ea58aac3c968d46038ac1b7ada Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 16:58:49 +0200 Subject: [PATCH 03/11] fix --- .github/workflows/weekly.yml | 2 +- README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 59e166b95..3a0ed966b 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -13,5 +13,5 @@ jobs: with: ocaml-compiler: 4.13.1 - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - - run: make -j4 + - run: make build - run: make test diff --git a/README.md b/README.md index 14225ea3e..b7e6d689d 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,8 @@ opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc men ``` You can then run `make build-charon-ml` to build the ML library, or even simply -`make` to build the whole project (Rust and OCaml). Finally, you can run the -tests with `make test`. +`make build` to build the whole project (Rust and OCaml). Finally, you can run +the tests with `make test`. Alternatively, you can use Nix and do `nix develop` (or use https://direnv.net/ and `direnv allow`) and all dependencies should be made available. From cfa5f8cd1e71977e08147c075f653d0847ef9fbd Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 16:59:48 +0200 Subject: [PATCH 04/11] install dune --- .github/workflows/weekly.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 3a0ed966b..c6571611f 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -12,6 +12,7 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 + - run: opam install dune - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - run: make build - run: make test From 336860dc9bc046298281ad7981b8fc0b63a78708 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 17:11:17 +0200 Subject: [PATCH 05/11] fix? --- .github/workflows/weekly.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index c6571611f..9652f5de0 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -12,7 +12,9 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 - - run: opam install dune + - run: | + opam install dune + eval $(opam env) - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - run: make build - run: make test From 600a25b2d276e6c99ed1cff1efc6079f2de369a8 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 17:28:04 +0200 Subject: [PATCH 06/11] fix? --- .github/workflows/weekly.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 9652f5de0..97e05891f 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -12,9 +12,8 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 - - run: | - opam install dune - eval $(opam env) + - run: opam env >> $GITHUB_ENV + - run: opam install dune - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - run: make build - run: make test From 6f07068447a92e389f0b9a12a23135d5b3d60638 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 17:39:39 +0200 Subject: [PATCH 07/11] fix? --- .github/workflows/weekly.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 97e05891f..971dce1a2 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -12,8 +12,7 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 - - run: opam env >> $GITHUB_ENV - run: opam install dune - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - - run: make build - - run: make test + - run: opam exec -- make build + - run: opam exec -- make test From e39fd648cc82f30c36c32517544c352ab152ecb6 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 17:51:34 +0200 Subject: [PATCH 08/11] is this necessary? --- .github/workflows/weekly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 971dce1a2..f5b0f363f 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -12,7 +12,6 @@ jobs: - uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 4.13.1 - - run: opam install dune - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - run: opam exec -- make build - run: opam exec -- make test From 61afe2c501a97c781ea8e15a4c3345fca398ea2d Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 17:52:03 +0200 Subject: [PATCH 09/11] set IN_CI --- .github/workflows/weekly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index f5b0f363f..da201b78f 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -14,4 +14,4 @@ jobs: ocaml-compiler: 4.13.1 - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - run: opam exec -- make build - - run: opam exec -- make test + - run: opam exec -- IN_CI=1 make test From f0acde60a53d81776e458be7bf7fec322d9d0601 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 17:59:47 +0200 Subject: [PATCH 10/11] fix? --- .github/workflows/weekly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index da201b78f..1166f3d7d 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -14,4 +14,4 @@ jobs: ocaml-compiler: 4.13.1 - run: opam install ppx_deriving visitors easy_logging zarith yojson core_unix odoc menhir - run: opam exec -- make build - - run: opam exec -- IN_CI=1 make test + - run: IN_CI=1 opam exec -- make test From 92ea7a0527e6bab361350627c2b3ead1c25065b9 Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Fri, 16 Aug 2024 18:09:01 +0200 Subject: [PATCH 11/11] Revert "temporarily enable workflow for pull requests" This reverts commit f6324a77f3c2b851932a9c1f63d0e27ede791eeb. --- .github/workflows/weekly.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index 1166f3d7d..425acbfb1 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -2,7 +2,6 @@ on: schedule: - cron: '0 0 * * 0' workflow_dispatch: - pull_request: jobs: default: