diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 02a132ec..1f11a2b8 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -3,7 +3,7 @@ name: github pages on: push: branches: - - master + - main jobs: deploy: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8d714d10..8d1b2cc3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,9 +3,8 @@ name: build on: pull_request: push: - schedule: - # Prime the caches every Monday - - cron: 0 1 * * MON + branches: + - main jobs: build: @@ -32,14 +31,11 @@ jobs: with: ocaml-compiler: ${{ matrix.ocaml-compiler }} allow-prerelease-opam: true - opam-local-packages: | - ./tiny_httpd.opam - ./tiny_httpd_camlzip.opam opam-depext-flags: --with-test - - run: opam install ./tiny_httpd.opam ./tiny_httpd_camlzip.opam --deps-only --with-test + - run: opam install ./tiny_httpd.opam ./tiny_httpd_camlzip.opam ./tiny_httpd_ws.opam --deps-only --with-test - - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip + - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip,tiny_httpd_ws - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd if: ${{ matrix.os == 'ubuntu-latest' }} @@ -49,6 +45,9 @@ jobs: - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd_camlzip if: ${{ matrix.os == 'ubuntu-latest' }} + - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd_ws + if: ${{ matrix.os == 'ubuntu-latest' }} + - run: opam install logs -y - - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip + - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip,tiny_httpd_ws diff --git a/.github/workflows/main5.yml b/.github/workflows/main5.yml deleted file mode 100644 index 04effbab..00000000 --- a/.github/workflows/main5.yml +++ /dev/null @@ -1,49 +0,0 @@ -name: build (ocaml 5) - -on: - pull_request: - push: - schedule: - # Prime the caches every Monday - - cron: 0 1 * * MON - -jobs: - build: - strategy: - fail-fast: true - matrix: - os: - - ubuntu-latest - #- macos-latest - #- windows-latest - ocaml-compiler: - - 5.1.x - - runs-on: ${{ matrix.os }} - - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Use OCaml ${{ matrix.ocaml-compiler }} - uses: ocaml/setup-ocaml@v2 - with: - ocaml-compiler: ${{ matrix.ocaml-compiler }} - opam-depext-flags: --with-test - allow-prerelease-opam: true - - - run: opam install . --deps-only --with-test - - - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip - - - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd - if: ${{ matrix.os == 'ubuntu-latest' }} - - - run: opam install tiny_httpd - - - run: opam exec -- dune build @src/runtest @examples/runtest @tests/runtest -p tiny_httpd_camlzip - if: ${{ matrix.os == 'ubuntu-latest' }} - - - run: opam install logs -y - - - run: opam exec -- dune build @install -p tiny_httpd,tiny_httpd_camlzip