diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4131ecd..bb6a691 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,27 +13,25 @@ jobs: matrix: os: - macos-latest + - macos-latest-large - ubuntu-latest - windows-latest - ocaml-version: - - 4.11.1 + ocaml-compiler: + - "5.2" include: - os: ubuntu-latest - ocaml-version: 4.07.0 + ocaml-version: "4.14" runs-on: ${{ matrix.os }} steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: setup-ocaml - uses: avsm/setup-ocaml@v1 + uses: ocaml/setup-ocaml@v3 with: - ocaml-version: ${{ matrix.ocaml-version }} + ocaml-compiler: ${{ matrix.ocaml-compiler }} - name: setup run: | - opam pin add . -y --no-action - opam depext -y ocb - opam install -y ./*.opam --deps-only --with-test - opam upgrade --fixup + opam install . --deps-only --with-test --with-doc - name: build run: opam exec -- dune build @install - name: test diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3d90108..b670b1c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,27 +8,24 @@ jobs: runs-on: ubuntu-latest steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: submodules: recursive persist-credentials: false - name: setup-ocaml - uses: avsm/setup-ocaml@v1 + uses: ocaml/setup-ocaml@v3 with: - ocaml-version: 4.10.0 + ocaml-compiler: "5.2" - name: setup-deploy run: | - opam pin add . -y --no-action - opam depext -y ocb - opam install -y ./*.opam --deps-only --with-test --with-doc - opam upgrade --fixup - touch doc/.nojekyll + opam install . --deps-only --with-test --with-doc - name: api run: | - opam exec -- dune build @doc + touch doc/.nojekyll + opam exec - dune build @doc mv _build/default/_doc/_html doc/api - name: deploy - uses: JamesIves/github-pages-deploy-action@3.6.2 + uses: JamesIves/github-pages-deploy-action@4.7.2 with: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BRANCH: gh-pages diff --git a/dune-project b/dune-project index f44163e..bb95179 100644 --- a/dune-project +++ b/dune-project @@ -24,7 +24,7 @@ "An OCaml library for SVG badge generation. There's also a command-line tool provided.") (depends (ocaml - (>= 4.05)) + (>= 4.14)) cmdliner dune prelude diff --git a/ocb.opam b/ocb.opam index 9091177..7b8e115 100644 --- a/ocb.opam +++ b/ocb.opam @@ -10,7 +10,8 @@ homepage: "https://ocamlpro.github.io/ocb/" doc: "https://ocamlpro.github.io/ocb/api/" bug-reports: "https://github.com/OCamlPro/ocb/issues" depends: [ - "ocaml" {>= "4.05"} + "ocaml" {>= "4.14"} + "cmdliner" "dune" {>= "3.0"} "prelude" "odoc" {with-doc}