From d33900ee90023fd78e7d8668d8678dc356b8825a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 13 Dec 2023 14:04:22 +0000 Subject: [PATCH 1/2] [maintenance]: add missing dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found by disabling `implicit_transitive_deps` Signed-off-by: Edwin Török --- dune-project | 1 + lib/xapi-stdext-date/dune | 2 +- lib/xapi-stdext-encodings/bench/dune | 2 +- lib/xapi-stdext-threads/dune | 2 +- lib/xapi-stdext-unix/dune | 1 + xapi-stdext-unix.opam | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dune-project b/dune-project index 4a5dce3e..a4973b11 100644 --- a/dune-project +++ b/dune-project @@ -91,6 +91,7 @@ base-unix (fd-send-recv (>= 2.0.0)) (odoc :with-doc) + xapi-backtrace (xapi-stdext-pervasives (= :version)) ) ) diff --git a/lib/xapi-stdext-date/dune b/lib/xapi-stdext-date/dune index 75de1b43..c2ed6c44 100644 --- a/lib/xapi-stdext-date/dune +++ b/lib/xapi-stdext-date/dune @@ -12,5 +12,5 @@ (name test) (package xapi-stdext-date) (modules test) - (libraries alcotest xapi-stdext-date) + (libraries alcotest xapi-stdext-date ptime) ) diff --git a/lib/xapi-stdext-encodings/bench/dune b/lib/xapi-stdext-encodings/bench/dune index 11f37666..9f12bcbf 100644 --- a/lib/xapi-stdext-encodings/bench/dune +++ b/lib/xapi-stdext-encodings/bench/dune @@ -2,5 +2,5 @@ (name bench_encodings) (modes exe) (optional) - (libraries bechamel xapi_stdext_encodings bechamel-notty notty.unix) + (libraries bechamel xapi_stdext_encodings bechamel-notty notty.unix fmt) ) diff --git a/lib/xapi-stdext-threads/dune b/lib/xapi-stdext-threads/dune index ecf854e3..fe2cc6dd 100644 --- a/lib/xapi-stdext-threads/dune +++ b/lib/xapi-stdext-threads/dune @@ -2,7 +2,7 @@ (public_name xapi-stdext-threads) (name xapi_stdext_threads) (libraries - threads + threads.posix unix xapi-stdext-pervasives) ) diff --git a/lib/xapi-stdext-unix/dune b/lib/xapi-stdext-unix/dune index 9cfcbb96..da0b509d 100644 --- a/lib/xapi-stdext-unix/dune +++ b/lib/xapi-stdext-unix/dune @@ -4,6 +4,7 @@ (libraries fd-send-recv unix + xapi-backtrace xapi-stdext-pervasives) (foreign_stubs (language c) diff --git a/xapi-stdext-unix.opam b/xapi-stdext-unix.opam index 1498e2bb..8c6a3829 100644 --- a/xapi-stdext-unix.opam +++ b/xapi-stdext-unix.opam @@ -12,6 +12,7 @@ depends: [ "base-unix" "fd-send-recv" {>= "2.0.0"} "odoc" {with-doc} + "xapi-backtrace" "xapi-stdext-pervasives" {= version} ] build: [ From 9e074eb5c383c56b182ff5edb4ecd49209547639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Wed, 13 Dec 2023 16:33:41 +0000 Subject: [PATCH 2/2] CI: update package repos to avoid 404 error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Edwin Török --- .github/workflows/ocaml-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ocaml-ci.yml b/.github/workflows/ocaml-ci.yml index 5f13703f..bb212541 100644 --- a/.github/workflows/ocaml-ci.yml +++ b/.github/workflows/ocaml-ci.yml @@ -23,6 +23,9 @@ jobs: id: dotenv uses: falti/dotenv-action@v0.2.4 + - name: Update package repos + run: sudo apt-get update -y + - name: Use ocaml uses: avsm/setup-ocaml@v1 with: