Fix 5.4 CI

Author: voodoos

.github/workflows/build-and-test.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-variants.5.4.0+trunk"
+          ocaml-compiler: "5.4"
 
       # Remove this pin once a compatible version of Merlin has been released
       - name: Pin dev Merlin
@@ -81,7 +81,7 @@ jobs:
       - name: Set-up OCaml
         uses: ocaml/setup-ocaml@v3
         with:
-          ocaml-compiler: "ocaml-variants.5.4.0+trunk"
+          ocaml-compiler: "5.4"
 
       - name: Set git user
         run: |