chore: update nix flakes, add OCaml 5.2 to CI (#201)

* chore: update nix flakes, add OCaml 5.2 to CI

* revert some changes

* add concurrency

* no dev

* no dev ssl

.github/workflows/opam-build.yml

@@ -21,7 +21,8 @@ jobs:
           # - macos-latest
           - ubuntu-latest
         ocaml-compiler:
-          - 5.x
+          - 5.1
+          - 5.2
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/test.yml

@@ -1,4 +1,8 @@
 {
+  "concurrency": {
+    "cancel-in-progress": true,
+    "group": "${{ github.workflow }}-${{ github.ref }}"
+  },
   "jobs": {
     "macos-latest": {
       "runs-on": "macos-latest",
@@ -24,7 +28,6 @@
         "fail-fast": false,
         "matrix": {
           "ocamlVersion": [
-            "5_1",
             "5_2"
           ]
         }

dune-project

@@ -26,17 +26,17 @@
   "Piaf is an HTTP library and webserver written entirely in OCaml.")
  (depends
   (ocaml
-   (>= "5.0"))
+   (>= "5.1"))
   logs
   (eio-ssl :dev)
   magic-mime
-  (ssl :dev)
+  ssl
   uri
   ipaddr
   httpun-eio
   gluten-eio
-  (h2-eio :dev)
-  (httpun-ws :dev)
+  h2-eio
+  httpun-ws
   (multipart_form :dev)
   (eio_main
    (>= "1.0"))

nix/ci/test.nix

@@ -10,7 +10,7 @@ let
   pkgs = import src {
     extraOverlays = [
       (self: super: {
-        ocamlPackages = super.ocaml-ng."ocamlPackages_${ocamlVersion}".overrideScope'
+        ocamlPackages = super.ocaml-ng."ocamlPackages_${ocamlVersion}".overrideScope
           (oself: osuper: {
             eio_main = osuper.eio_main.overrideAttrs (_: {
               # Use eio_posix until the kernel version for GH Actions gets rolled

nix/gh-actions.nix

@@ -39,6 +39,10 @@ let
     cachedBuild = { name, branches ? [ "master" ], os }:
       lib.generators.toYAML { } {
         inherit name;
+        concurrency = {
+          group = "\${{ github.workflow }}-\${{ github.ref }}";
+          cancel-in-progress = true;
+        };
         on = {
           pull_request = null;
           push = {
@@ -65,7 +69,7 @@ gh-actions.cachedBuild {
   os = {
     macos-latest = {
       name = "Run nix-build";
-      ocamlVersions = [ "5_1" "5_2" ];
+      ocamlVersions = [ "5_2" ];
       run = "nix-build ./nix/ci/test.nix -A native --argstr ocamlVersion \${{ matrix.ocamlVersion }}";
     };
     ubuntu-latest = {

piaf.opam

@@ -10,17 +10,17 @@ homepage: "https://github.com/anmonteiro/piaf"
 bug-reports: "https://github.com/anmonteiro/piaf/issues"
 depends: [
   "dune" {>= "2.8"}
-  "ocaml" {>= "5.0"}
+  "ocaml" {>= "5.1"}
   "logs"
   "eio-ssl" {dev}
   "magic-mime"
-  "ssl" {dev}
+  "ssl"
   "uri"
   "ipaddr"
   "httpun-eio"
   "gluten-eio"
-  "h2-eio" {dev}
-  "httpun-ws" {dev}
+  "h2-eio"
+  "httpun-ws"
   "multipart_form" {dev}
   "eio_main" {>= "1.0"}
   "dune-site" {with-test}