Skip to content

Commit 069347e

Browse files
committed
Revert github workflow for 4.14
1 parent 6d5aaa9 commit 069347e

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

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

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
7+
- 414-LTS
88
schedule:
99
# Prime the caches every Monday
1010
- cron: 0 1 * * MON
@@ -20,6 +20,8 @@ jobs:
2020
- ubuntu-latest
2121
- macos-latest
2222
- windows-latest
23+
ocaml-compiler:
24+
- "4.14"
2325

2426
runs-on: ${{ matrix.os }}
2527

@@ -40,33 +42,36 @@ jobs:
4042
node-version: lts/*
4143

4244
- name: Install npm packages
43-
run: yarn install --frozen-lockfile
45+
run: yarn --frozen-lockfile
46+
working-directory: ocaml-lsp-server/test/e2e
4447

4548
- name: Set-up OCaml
4649
uses: ocaml/setup-ocaml@v3
4750
with:
48-
ocaml-compiler: "ocaml-base-compiler.5.3.0"
51+
ocaml-compiler: ${{ matrix.ocaml-compiler }}
4952

5053
# Remove this pin once a compatible version of Merlin has been released
5154
- name: Pin dev Merlin
52-
run: opam --cli=2.1 pin --with-version=5.6-504 https://github.com/voodoos/merlin.git#main
55+
run: opam pin --with-version 4.19-414 https://github.com/voodoos/merlin.git#414-4.19-backports
5356

5457
- name: Build and install dependencies
5558
run: opam install .
5659

57-
# the makefile explains why we don't use --with-test
58-
# ppx expect is not yet compatible with 5.1 and test output vary from one
59-
# compiler to another. We only test on 4.14.
60+
# the makefile explains why we don't use test dependencies
6061
- name: Install test dependencies
62+
if: matrix.ocaml-compiler == '4.14'
6163
run: opam exec -- make install-test-deps
6264

6365
- name: Run build @all
66+
if: matrix.ocaml-compiler == '4.14'
6467
run: opam exec -- make all
6568

6669
- name: Run the unit tests
70+
if: matrix.ocaml-compiler == '4.14'
6771
run: opam exec -- make test-ocaml
6872

6973
- name: Run the template integration tests
74+
if: matrix.ocaml-compiler == '4.14'
7075
run: opam exec -- make test-e2e
7176

7277
coverage:
@@ -81,17 +86,13 @@ jobs:
8186
- name: Set-up OCaml
8287
uses: ocaml/setup-ocaml@v3
8388
with:
84-
ocaml-compiler: "ocaml-base-compiler.5.3.0"
89+
ocaml-compiler: "4.14"
8590

8691
- name: Set git user
8792
run: |
8893
git config --global user.name github-actions[bot]
8994
git config --global user.email github-actions[bot]@users.noreply.github.com
9095
91-
# Remove this pin once a compatible version of Merlin has been released
92-
- name: Pin dev Merlin
93-
run: opam --cli=2.1 pin --with-version=5.6-504 https://github.com/voodoos/merlin.git#main
94-
9596
- name: Install dependencies
9697
run: |
9798
opam install . --deps-only

0 commit comments

Comments
 (0)