More minor changes

janestreet · Nov 15, 2023 · 04e1c33 · 04e1c33
1 parent d437553
commit 04e1c33
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/.github/workflows/flambda-backend.yml b/.github/workflows/flambda-backend.yml
@@ -1,12 +1,12 @@
-name: build and run tests with flambda-backend
+name: Run Tests
 on:
   push:
   pull_request:
 
 jobs:
   build:
     # The type of runner that the job will run on
-    name: ${{ matrix.name }}
+    name: built with flambda-backend, ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -16,7 +16,7 @@ jobs:
           - os: ubuntu-latest
             flambda-backend-config: --enable-middle-end=flambda2 --disable-naked-pointers
             name: flambda2
-            ocaml-compiler: 4.14.x
+            ocaml-compiler: 5.1.x
 
     env:
       MERLIN_TESTS: all
@@ -39,7 +39,7 @@ jobs:
       id: cache
       with:
         path: ${{ github.workspace }}/flambda-backend/_install
-        key: cache-flambda-backend-${{ matrix.name }}-${{ hashFiles('upstream/ocaml_flambda/base-rev.txt') }}
+        key: cache-flambda-backend-${{ matrix.name }}-${{ hashFiles('merlin-jst/upstream/ocaml_flambda/base-rev.txt') }}
 
     - name: Clone the flambda-backend repo
       uses: actions/checkout@master
@@ -52,11 +52,15 @@ jobs:
       if: steps.cache.outputs.cache-hit != 'true'
       working-directory: flambda-backend
       run: |
-        git checkout "$(cat $GITHUB_WORKSPACE/merlin-jst/upstream/ocaml_flambda/base_rev.txt)"
+        REV=$(cat $GITHUB_WORKSPACE/merlin-jst/upstream/ocaml_flambda/base-rev.txt)
+        git fetch origin "$REV"
+        git checkout "$REV"
 
     - name: Install dependencies for flambda-backend
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
+        opam switch create 4.14.0 --yes
+        opam switch link 4.14.0 --yes
         opam install --yes dune.3.10.0 menhir.20210419
 
     - name: Configure, build, and install flambda-backend