diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml new file mode 100644 index 00000000..95d6f6b8 --- /dev/null +++ b/.github/workflows/format.yml @@ -0,0 +1,30 @@ + + +name: format + +on: + push: + branches: + - main + pull_request: + +jobs: + format: + name: format + strategy: + matrix: + ocaml-compiler: + - '5.3' + runs-on: 'ubuntu-latest' + steps: + - uses: actions/checkout@main + - name: Use OCaml ${{ matrix.ocaml-compiler }} + uses: ocaml/setup-ocaml@v3 + with: + ocaml-compiler: ${{ matrix.ocaml-compiler }} + dune-cache: true + allow-prerelease-opam: true + + - run: opam install ocamlformat.0.27.0 + - run: opam exec -- make format-check + diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml deleted file mode 100644 index bd08bcac..00000000 --- a/.github/workflows/gh-pages.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: github pages - -on: - push: - branches: - - main - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@main - - # needed for depext to work - - run: sudo apt-get update && sudo apt-get install mccs - - - uses: ocaml/setup-ocaml@v3 - with: - ocaml-compiler: '5.1.x' - dune-cache: true - allow-prerelease-opam: true - - - run: | - opam pin trace https://github.com/ocaml-tracing/ocaml-trace.git#main -y -n - opam pin https://github.com/ocaml-tracing/ambient-context.git#main -y -n - - - name: Deps - run: opam install odig opentelemetry opentelemetry-lwt opentelemetry-client-ocurl opentelemetry-cohttp-lwt - - - name: Build - run: opam exec -- odig odoc --cache-dir=_doc/ opentelemetry opentelemetry-lwt opentelemetry-client-ocurl opentelemetry-cohttp-lwt - - - name: Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: ./_doc/html - enable_jekyll: false diff --git a/Makefile b/Makefile index b4d41f61..0ae04b40 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,9 @@ odig-doc: format: @dune build @fmt --auto-promote +format-check: + @dune build $(DUNE_OPTS) @fmt --display=quiet + WATCH ?= @all watch: @dune build $(WATCH) -w $(OPTS)