From e5f8b738c9c1f16fbdf02bbb47beadb87ea47ff2 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 30 Apr 2024 18:54:07 +0900 Subject: [PATCH 1/9] Update GitHub Actions workflow Signed-off-by: Sora Morimoto --- .github/dependabot.yml | 6 ++++++ .github/workflows/master.yml | 28 ++++++++++------------------ 2 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..ca79ca5 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: weekly diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index b6b198d..7b4c0d8 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1,37 +1,29 @@ name: Main workflow on: - pull_request: push: + pull_request: schedule: - - cron: "0 13 * * 1" # Every Monday at 1PM UTC - # https://jasonet.co/posts/scheduled-actions/ + # Prime the caches every Monday + - cron: 0 1 * * MON jobs: build: - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - ocaml-compiler: - - 4.13.x - - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest steps: - - name: Checkout code - uses: actions/checkout@v2 + - name: Checkout tree + uses: actions/checkout@v4 - - name: Use OCaml ${{ matrix.ocaml-compiler }} + - name: Set-up OCaml uses: ocaml/setup-ocaml@v2 with: - ocaml-compiler: ${{ matrix.ocaml-compiler }} + ocaml-compiler: "4.14" + allow-prerelease-opam: true # ideally it should be done by `opam install . --deps-only` but right now # we have opam 1.x in the repo, and I'm not very optimistic to even try it - - run: opam depext conf-dbm -y - - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic -y + - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic - name: Compiling simple run: opam exec -- make -C simple all From 784364753b3c1391bb15ea4a2e5779998bd69357 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 08:13:44 +0900 Subject: [PATCH 2/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7b4c0d8..c3cb85c 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -23,7 +23,7 @@ jobs: # ideally it should be done by `opam install . --deps-only` but right now # we have opam 1.x in the repo, and I'm not very optimistic to even try it - - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic + - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic conf-dbm - name: Compiling simple run: opam exec -- make -C simple all From 22971a1fe5dc6c945154319c8a4e81e09cda0b64 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 08:41:23 +0900 Subject: [PATCH 3/9] _ Signed-off-by: Sora Morimoto --- .depend | 6 ------ .github/workflows/master.yml | 6 ++++-- .gitignore | 6 ++++++ 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 .depend create mode 100644 .gitignore diff --git a/.depend b/.depend deleted file mode 100644 index 4e4cb10..0000000 --- a/.depend +++ /dev/null @@ -1,6 +0,0 @@ -_server/graffiti.cmo: -_server/graffiti.cmx: -_client/graffiti.cmo: -_client/graffiti.cmx: -_client/graffiti.cmo: _server/graffiti.type_mli -_client/graffiti.cmx: _server/graffiti.type_mli diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index c3cb85c..4a64691 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -26,7 +26,9 @@ jobs: - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic conf-dbm - name: Compiling simple - run: opam exec -- make -C simple all + run: opam exec -- make all + working-directory: simple - name: Compiling extended - run: opam exec -- make -C extended all + run: opam exec -- make all + working-directory: extended diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5ce015e --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +_build/ +_client/ +_deps/ +_opam/ +_server/ +.depend From 09d166bc0486520c997e8240f587a773b4d7b3cd Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 08:46:24 +0900 Subject: [PATCH 4/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 4a64691..80385f3 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -19,6 +19,7 @@ jobs: uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: "4.14" + dune-cache: true allow-prerelease-opam: true # ideally it should be done by `opam install . --deps-only` but right now @@ -26,7 +27,7 @@ jobs: - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic conf-dbm - name: Compiling simple - run: opam exec -- make all + run: opam exec -- dune build @all working-directory: simple - name: Compiling extended From a4d3cc36e888545c79c464ecd61cdf7811505cef Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 08:55:28 +0900 Subject: [PATCH 5/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 80385f3..aa248e4 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: # ideally it should be done by `opam install . --deps-only` but right now # we have opam 1.x in the repo, and I'm not very optimistic to even try it - - run: opam install eliom ocsigen-toolkit cairo2 ocsipersist-dbm calendar syndic conf-dbm + - run: opam install cairo2 calendar conf-dbm eliom ocsigen-ppx-rpc ocsigen-toolkit ocsipersist-dbm pgocaml_ppx syndic - name: Compiling simple run: opam exec -- dune build @all From 27b01315d3d3e3fe385bce02e1a90fb10dadbc2e Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 09:01:37 +0900 Subject: [PATCH 6/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index aa248e4..436142d 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -24,7 +24,7 @@ jobs: # ideally it should be done by `opam install . --deps-only` but right now # we have opam 1.x in the repo, and I'm not very optimistic to even try it - - run: opam install cairo2 calendar conf-dbm eliom ocsigen-ppx-rpc ocsigen-toolkit ocsipersist-dbm pgocaml_ppx syndic + - run: opam install cairo2 calendar conf-dbm eliom ocsigen-i18n ocsigen-ppx-rpc ocsigen-toolkit ocsipersist-dbm pgocaml_ppx syndic - name: Compiling simple run: opam exec -- dune build @all From aa96c9e10f7615abf8a455fc4502faecaed7c4c0 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 09:08:32 +0900 Subject: [PATCH 7/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 436142d..cefa0df 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -27,7 +27,7 @@ jobs: - run: opam install cairo2 calendar conf-dbm eliom ocsigen-i18n ocsigen-ppx-rpc ocsigen-toolkit ocsipersist-dbm pgocaml_ppx syndic - name: Compiling simple - run: opam exec -- dune build @all + run: opam exec -- make all working-directory: simple - name: Compiling extended From c2275cdc4fb206c6fd7c2614e2c831f77fc60cea Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Wed, 8 May 2024 09:14:04 +0900 Subject: [PATCH 8/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index cefa0df..3ba370e 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -27,9 +27,7 @@ jobs: - run: opam install cairo2 calendar conf-dbm eliom ocsigen-i18n ocsigen-ppx-rpc ocsigen-toolkit ocsipersist-dbm pgocaml_ppx syndic - name: Compiling simple - run: opam exec -- make all - working-directory: simple + run: opam exec -- make -C simple all - name: Compiling extended - run: opam exec -- make all - working-directory: extended + run: opam exec -- make -C extended all From 7ffca2ab5501dd607dd61e5db1e30a3a44a6c904 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Thu, 2 Jan 2025 00:28:00 +0900 Subject: [PATCH 9/9] _ Signed-off-by: Sora Morimoto --- .github/workflows/master.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 3ba370e..2176f97 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -1,26 +1,31 @@ -name: Main workflow +name: Builds, tests & co on: - push: - pull_request: - schedule: - # Prime the caches every Monday - - cron: 0 1 * * MON + - push + - pull_request + +permissions: read-all jobs: build: - runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - macos-latest + - windows-latest + + runs-on: ${{ matrix.os }} steps: - name: Checkout tree uses: actions/checkout@v4 - name: Set-up OCaml - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3 with: - ocaml-compiler: "4.14" - dune-cache: true - allow-prerelease-opam: true + ocaml-compiler: 4 # ideally it should be done by `opam install . --deps-only` but right now # we have opam 1.x in the repo, and I'm not very optimistic to even try it