Skip to content

Commit dabcd09

Browse files
committed
More gh action fixes
1 parent 686470e commit dabcd09

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@ jobs:
1717
- uses: hecrj/setup-rust-action@v1
1818
with:
1919
rust-version: stable
20+
- if: matrix.os == 'ubuntu-latest'
21+
name: 'Run "apt update" so setup-ocaml can install depexts (ubuntu)'
22+
run: |
23+
sudo apt update
2024
- name: Set-up OCaml
2125
uses: ocaml/setup-ocaml@v2
2226
with:
2327
ocaml-compiler: "4.14.1"
24-
- if: matrix.os == 'ubuntu-latest'
25-
name: 'Install dependencies (ubuntu)'
26-
run: |
27-
sudo apt update
28-
sudo apt install libasound2-dev libsdl2-dev
2928
- run: opam install . --deps-only --with-test
3029
- run: opam exec -- dune build
3130
- run: opam exec -- dune runtest
@@ -47,21 +46,20 @@ jobs:
4746
tar -czf /tmp/llama.tar.gz --exclude=.git -C .. llama
4847
mkdir /tmp/empty
4948
cd /tmp/empty
49+
- if: matrix.os == 'ubuntu-latest'
50+
name: 'Run "apt update" so setup-ocaml can install depexts (ubuntu)'
51+
run: |
52+
sudo apt update
5053
- if: matrix.os == 'ubuntu-latest'
5154
name: Set-up OCaml
5255
uses: ocaml/setup-ocaml@v2
5356
with:
5457
ocaml-compiler: "4.14.1"
5558
opam-depext-flags: tsdl,conf-pkg-config,conf-alsa
56-
- if: matrix.os == 'ubuntu-latest'
57-
name: 'Install dependencies (ubuntu)'
58-
run: |
59-
sudo apt update
60-
sudo apt install libasound2-dev libsdl2-dev
6159
- if: matrix.os == 'macOS-latest'
6260
name: Set-up OCaml
6361
uses: ocaml/setup-ocaml@v2
6462
with:
6563
ocaml-compiler: "4.14.1"
66-
opam-depext-flags: ocamlsdl2
64+
opam-depext-flags: tsdl
6765
- run: opam pin /tmp/llama.tar.gz

0 commit comments

Comments
 (0)