CI update

ocaml · Nov 29, 2024 · 6da127a · 6da127a
1 parent 9f84a86
commit 6da127a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 150 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - 414-LTS
   schedule:
     # Prime the caches every Monday
     - cron: 0 1 * * MON

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -2,7 +2,7 @@ name: Changelog check
 
 on:
   pull_request:
-    branches: [master]
+    branches: [414-LTS]
     types: [opened, synchronize, reopened, labeled, unlabeled]
 
 jobs:

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-      - master
+      - 414-LTS
 jobs:
   # tests:
   #   runs-on: ubuntu-latest

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,13 +1,9 @@
 {
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs.url = "github:nix-ocaml/nix-overlays";
-    merlin5_2 = {
-      url = "github:ocaml/merlin/main";
-      flake = false;
-    };
-    merlin5_1 = {
-      url = "github:ocaml/merlin/501";
+    nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    merlin4_14 = {
+      url = "github:ocaml/merlin/v4.18-414";
       flake = false;
     };
   };
@@ -30,7 +26,7 @@
         });
         dune-release =
           prev.dune-release.overrideAttrs (_: { doCheck = false; });
-        ocamlPackages = prev.ocamlPackages.overrideScope' (oself: osuper:
+        ocamlPackages = prev.ocamlPackages.overrideScope (oself: osuper:
           let
             fixPreBuild = o: {
               propagatedBuildInputs = o.propagatedBuildInputs ++ [ oself.pp ];
@@ -58,33 +54,24 @@
         in rec {
           jsonrpc = buildDunePackage (basePackage // {
             pname = "jsonrpc";
-            doCheck = false;
             propagatedBuildInputs = with pkgs.ocamlPackages; [ ];
           });
 
           lsp = buildDunePackage (basePackage // {
             pname = "lsp";
-            doCheck = false;
             propagatedBuildInputs = with pkgs.ocamlPackages; [
               jsonrpc
               yojson
               ppx_yojson_conv_lib
               uutf
             ];
             checkInputs = let p = pkgs.ocamlPackages;
-            in [
-              p.stdune
-              p.cinaps
-              p.ppx_expect
-              p.ppx_yojson_conv
-              (ocamlformat pkgs)
-            ];
+            in [ p.cinaps p.ppx_expect p.ppx_yojson_conv (ocamlformat pkgs) ];
           });
 
           ocaml-lsp = with pkgs.ocamlPackages;
             buildDunePackage (basePackage // {
               pname = package;
-              doCheck = false;
               checkInputs = let p = pkgs.ocamlPackages;
               in [
                 p.ppx_expect
@@ -137,64 +124,21 @@
             overlays = [ (ocamlVersionOverlay ocaml) (overlay merlin) ];
             inherit system;
           };
-<<<<<<< HEAD
-        pkgs_5_1 =
-          makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1;
-        pkgs_5_2 =
-          makeNixpkgs (ocaml: ocaml.ocamlPackages_5_2) inputs.merlin5_2;
-        localPackages_5_1 = makeLocalPackages pkgs_5_1;
-        localPackages_5_2 = makeLocalPackages pkgs_5_2;
-||||||| 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233))
-        pkgs_4_14 =
-          makeNixpkgs (ocaml: ocaml.ocamlPackages_4_14) inputs.merlin4_14;
-        pkgs_5_2 =
-          makeNixpkgs (ocaml: ocaml.ocamlPackages_5_2) inputs.merlin5_2;
-        localPackages_4_14 = makeLocalPackages pkgs_4_14;
-        localPackages_5_2 = makeLocalPackages pkgs_5_2;
-=======
         pkgs_4_14 =
           makeNixpkgs (ocaml: ocaml.ocamlPackages_4_14) inputs.merlin4_14;
-        pkgs_5_1 =
-          makeNixpkgs (ocaml: ocaml.ocamlPackages_5_1) inputs.merlin5_1;
         localPackages_4_14 = makeLocalPackages pkgs_4_14;
-        localPackages_5_1 = makeLocalPackages pkgs_5_1;
->>>>>>> parent of 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233))
         devShell = localPackages: nixpkgs:
           nixpkgs.mkShell {
             buildInputs = [ nixpkgs.ocamlPackages.utop ];
-            inputsFrom =
-              builtins.map (x: x.overrideAttrs (p: n: { doCheck = true; }))
-              (builtins.attrValues localPackages);
+            inputsFrom = builtins.attrValues localPackages;
           };
       in {
-<<<<<<< HEAD
-        packages = (localPackages_5_2 // {
-          default = localPackages_5_2.ocaml-lsp;
-          ocaml_5_1 = localPackages_5_1;
-        });
-||||||| 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233))
-        packages =
-          (localPackages_5_2 // { default = localPackages_5_2.ocaml-lsp; });
-=======
         packages =
           (localPackages_4_14 // { default = localPackages_4_14.ocaml-lsp; });
->>>>>>> parent of 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233))
 
         devShells = {
-<<<<<<< HEAD
-          default = devShell localPackages_5_2 pkgs_5_2;
-||||||| 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233))
-          ocaml4_11 = devShell localPackages_4_14 pkgs_4_14;
-
-          default = devShell localPackages_5_2 pkgs_5_2;
-=======
           default = devShell localPackages_4_14 pkgs_4_14;
 
-          ocaml5_1 = devShell localPackages_5_1 pkgs_5_1;
->>>>>>> parent of 4e741568 (Compatibility with merlin-lib 5.1-502 (#1233))
-
-          ocaml5_1 = devShell localPackages_5_1 pkgs_5_1;
-
           release = pkgsWithoutOverlays.mkShell {
             buildInputs = [ pkgsWithoutOverlays.dune-release ];
           };