From 50ea6077cbff8773787331fbf38d2535e912c7c0 Mon Sep 17 00:00:00 2001 From: Marc-Antoine Ouimet Date: Mon, 22 Jul 2024 08:46:34 -0400 Subject: [PATCH] Use `conf-timeout` opam package to ensure `coreutils` is installed when testing This change was recommended when Beluga v1.1.2 was released: https://github.com/ocaml/opam-repository/pull/26266 --- .github/workflows/build-and-test.yml | 4 ---- beluga.opam | 1 + dune-project | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index dabca3d62..a25563494 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -78,9 +78,5 @@ jobs: - name: Build run: opam exec -- make - - name: Install coreutils on MacOS - if: runner.os == 'macOS' - run: brew install coreutils - - name: Test run: opam exec -- make test diff --git a/beluga.opam b/beluga.opam index 30f57b4c7..59c0e28a9 100644 --- a/beluga.opam +++ b/beluga.opam @@ -24,6 +24,7 @@ depends: [ "sedlex" {>= "2.5"} "omd" {>= "1.3.2"} "uri" {>= "4.2.0"} + "conf-timeout" {with-test} "ocamlformat" {= "0.25.1" & with-test} "yojson" {>= "2.0.2" & with-test} "ounit2" {>= "2.2.6" & with-test} diff --git a/dune-project b/dune-project index cf3873a0e..a89c309d3 100644 --- a/dune-project +++ b/dune-project @@ -44,6 +44,7 @@ (>= 1.3.2)) (uri (>= 4.2.0)) + (conf-timeout :with-test) (ocamlformat (and (= 0.25.1)