From f84f16b34a0db23ad1c633f4a8d2bbedcc08094a Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Tue, 22 Mar 2022 10:01:19 -0400 Subject: [PATCH] update atomic, do not list it as opam dep --- .github/workflows/main.yml | 1 - dune-project | 2 +- opentelemetry-client-ocurl.opam | 1 - vendor/atomic | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a8ced97d..7d306492 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,6 @@ jobs: with: ocaml-compiler: ${{ matrix.ocaml-compiler }} opam-depext-flags: --with-test - opam-local-packages: ["*.opam", "vendor/atomic/*.opam"] - run: opam install . --deps-only --with-test diff --git a/dune-project b/dune-project index 03b38470..75f525eb 100644 --- a/dune-project +++ b/dune-project @@ -39,7 +39,7 @@ (ocaml (>= "4.08")) (dune (>= "2.3")) mtime - atomic + ; atomic ; vendored (opentelemetry (= :version)) (ocaml-protoc (>= 2.1)) (odoc :with-doc) diff --git a/opentelemetry-client-ocurl.opam b/opentelemetry-client-ocurl.opam index 52aca892..e6d4b97a 100644 --- a/opentelemetry-client-ocurl.opam +++ b/opentelemetry-client-ocurl.opam @@ -11,7 +11,6 @@ depends: [ "ocaml" {>= "4.08"} "dune" {>= "2.3"} "mtime" - "atomic" "opentelemetry" {= version} "ocaml-protoc" {>= "2.1"} "odoc" {with-doc} diff --git a/vendor/atomic b/vendor/atomic index 7802992a..12dc7c84 160000 --- a/vendor/atomic +++ b/vendor/atomic @@ -1 +1 @@ -Subproject commit 7802992a568bf86c940e1c08a208e85102a0df6b +Subproject commit 12dc7c84f79606a8a0026ba1eb7856b3cdf6cab6