Skip to content

Commit 03d7fe7

Browse files
authored
Merge pull request #72 from lyrm/CI_changes
CI clean up
2 parents a1e1613 + 087e287 commit 03d7fe7

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,8 @@ on:
88
- cron: 0 1 * * MON
99

1010
jobs:
11-
build:
12-
strategy:
13-
matrix:
14-
os:
15-
- ubuntu-latest
16-
- macos-latest
17-
ocaml-compiler:
18-
- ocaml-base-compiler.5.0.0
19-
- ocaml-variants.5.1.0+trunk
20-
21-
runs-on: ${{ matrix.os }}
11+
windows:
12+
runs-on: windows-latest
2213

2314
env:
2415
QCHECK_MSG_INTERVAL: '60'
@@ -34,15 +25,18 @@ jobs:
3425
curl -sH "Accept: application/vnd.github.v3+json" \
3526
https://api.github.com/repos/ocaml/ocaml/commits/trunk \
3627
| jq .commit.tree.sha | xargs printf '::set-output name=commit::%s'
28+
3729
- name: Use OCaml ${{ matrix.ocaml-compiler }}
3830
uses: ocaml/setup-ocaml@v2
3931
with:
40-
ocaml-compiler: ${{ matrix.ocaml-compiler }}
32+
opam-pin: false
33+
opam-depext: false
34+
ocaml-compiler: ocaml.5.0.0,ocaml-option-mingw
4135
opam-repositories: |
42-
default: https://github.com/ocaml/opam-repository.git
43-
alpha: https://github.com/kit-ty-kate/opam-alpha-repository.git
36+
dra27: https://github.com/dra27/opam-repository.git#windows-5.0
37+
default: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
38+
upstream: https://github.com/ocaml/opam-repository.git
4439
cache-prefix: ${{ steps.multicore_hash.outputs.commit }}
45-
opam-depext: false
4640

4741
- run: opam install . --deps-only --with-test
4842

lockfree.opam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ depends: [
1919
"yojson" {>= "2.0.2"}
2020
"dscheck" {with-test & >= "0.0.1"}
2121
]
22+
available: arch != "x86_32" & arch != "arm32" & arch != "ppc64"
2223
depopts: []
2324
build: ["dune" "build" "-p" name "-j" jobs]

0 commit comments

Comments
 (0)