From 10b62a2a9786db685ae23822a26b28dc6d35715c Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Tue, 18 Jul 2023 16:44:10 -0700 Subject: [PATCH] chore(nix): build `@github_action_tests` (#149) --- dune-project | 2 +- flake.lock | 20 ++++++++++---------- nix/default.nix | 3 +++ ssl.opam | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dune-project b/dune-project index 63dd254..52a307d 100644 --- a/dune-project +++ b/dune-project @@ -6,7 +6,7 @@ (generate_opam_files true) (source - (github melange-re/melange)) + (github savonet/ocaml-ssl)) (maintainers "Antonio Monteiro ") diff --git a/flake.lock b/flake.lock index 4587449..ea6fdec 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -26,11 +26,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1686453844, - "narHash": "sha256-et1oAsQIxSSlIoA+2MHyBK5jOsyFLfZy7BjBG3/wNY4=", + "lastModified": 1689474348, + "narHash": "sha256-ahbwC8FkW0m2KH5xKB+LzB8kNofsBAo/r1NaQ+csSEI=", "owner": "anmonteiro", "repo": "nix-overlays", - "rev": "89083d292b7029ff9d21f9ad60b564be3ad9c180", + "rev": "e48f146965f62cfe425c25b18be47f5a9acd113e", "type": "github" }, "original": { @@ -41,17 +41,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686412476, - "narHash": "sha256-inl9SVk6o5h75XKC79qrDCAobTD1Jxh6kVYTZKHzewA=", + "lastModified": 1689353800, + "narHash": "sha256-otYIhlggg1kspAfl3EFTuiPv5zF8QcBSyO7K5uEnqo8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "21951114383770f96ae528d0ae68824557768e81", + "rev": "af59b3fb98ba6c3868522a3bc1c13388c09163ab", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "21951114383770f96ae528d0ae68824557768e81", + "rev": "af59b3fb98ba6c3868522a3bc1c13388c09163ab", "type": "github" } }, diff --git a/nix/default.nix b/nix/default.nix index 8a1aeed..0753f25 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -25,4 +25,7 @@ buildDunePackage { checkInputs = [ alcotest ]; inherit doCheck; + checkPhase = '' + dune build -p ssl @runtest @github_action_tests ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} + ''; } diff --git a/ssl.opam b/ssl.opam index 2dff1b0..6db773e 100644 --- a/ssl.opam +++ b/ssl.opam @@ -31,4 +31,4 @@ build: [ "@doc" {with-doc} ] ] -dev-repo: "git+https://github.com/melange-re/melange.git" +dev-repo: "git+https://github.com/savonet/ocaml-ssl.git"