From e9b32d549ca4f549a3faa7dd1bc1d1cb04a6106f Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 3 Dec 2024 03:52:36 +0900 Subject: [PATCH 1/2] Remove *.opam.template Signed-off-by: Sora Morimoto --- js_of_ocaml-compiler.opam | 3 ++- js_of_ocaml-compiler.opam.template | 13 ------------- js_of_ocaml-lwt.opam | 3 ++- js_of_ocaml-lwt.opam.template | 13 ------------- js_of_ocaml-ppx.opam | 3 ++- js_of_ocaml-ppx.opam.template | 13 ------------- js_of_ocaml-ppx_deriving_json.opam | 3 ++- js_of_ocaml-ppx_deriving_json.opam.template | 13 ------------- js_of_ocaml-toplevel.opam | 3 ++- js_of_ocaml-toplevel.opam.template | 13 ------------- js_of_ocaml-tyxml.opam | 3 ++- js_of_ocaml-tyxml.opam.template | 13 ------------- js_of_ocaml.opam | 3 ++- js_of_ocaml.opam.template | 13 ------------- 14 files changed, 14 insertions(+), 98 deletions(-) delete mode 100644 js_of_ocaml-compiler.opam.template delete mode 100644 js_of_ocaml-lwt.opam.template delete mode 100644 js_of_ocaml-ppx.opam.template delete mode 100644 js_of_ocaml-ppx_deriving_json.opam.template delete mode 100644 js_of_ocaml-toplevel.opam.template delete mode 100644 js_of_ocaml-tyxml.opam.template delete mode 100644 js_of_ocaml.opam.template diff --git a/js_of_ocaml-compiler.opam b/js_of_ocaml-compiler.opam index 8eb65727b8..c23a606e61 100644 --- a/js_of_ocaml-compiler.opam +++ b/js_of_ocaml-compiler.opam @@ -32,7 +32,6 @@ conflicts: [ "ocamlfind" {< "1.5.1"} "js_of_ocaml" {< "3.0"} ] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -43,6 +42,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml-compiler.opam.template b/js_of_ocaml-compiler.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml-compiler.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] diff --git a/js_of_ocaml-lwt.opam b/js_of_ocaml-lwt.opam index af46230bdb..070d2fc6fe 100644 --- a/js_of_ocaml-lwt.opam +++ b/js_of_ocaml-lwt.opam @@ -24,7 +24,6 @@ depends: [ "odoc" {with-doc} ] depopts: ["graphics" "lwt_log"] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -35,6 +34,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml-lwt.opam.template b/js_of_ocaml-lwt.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml-lwt.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] diff --git a/js_of_ocaml-ppx.opam b/js_of_ocaml-ppx.opam index 52f72e2c13..222494ff71 100644 --- a/js_of_ocaml-ppx.opam +++ b/js_of_ocaml-ppx.opam @@ -21,7 +21,6 @@ depends: [ "re" {>= "1.9.0" & with-test} "odoc" {with-doc} ] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -32,6 +31,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml-ppx.opam.template b/js_of_ocaml-ppx.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml-ppx.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] diff --git a/js_of_ocaml-ppx_deriving_json.opam b/js_of_ocaml-ppx_deriving_json.opam index 0600f216b2..52b2fc8321 100644 --- a/js_of_ocaml-ppx_deriving_json.opam +++ b/js_of_ocaml-ppx_deriving_json.opam @@ -21,7 +21,6 @@ depends: [ "re" {>= "1.9.0" & with-test} "odoc" {with-doc} ] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -32,6 +31,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml-ppx_deriving_json.opam.template b/js_of_ocaml-ppx_deriving_json.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml-ppx_deriving_json.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] diff --git a/js_of_ocaml-toplevel.opam b/js_of_ocaml-toplevel.opam index b2daa598b2..b47619bc32 100644 --- a/js_of_ocaml-toplevel.opam +++ b/js_of_ocaml-toplevel.opam @@ -24,7 +24,6 @@ depends: [ "re" {>= "1.9.0" & with-test} "odoc" {with-doc} ] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -35,6 +34,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml-toplevel.opam.template b/js_of_ocaml-toplevel.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml-toplevel.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] diff --git a/js_of_ocaml-tyxml.opam b/js_of_ocaml-tyxml.opam index 7f7af606f1..00e489acb5 100644 --- a/js_of_ocaml-tyxml.opam +++ b/js_of_ocaml-tyxml.opam @@ -25,7 +25,6 @@ depends: [ "re" {>= "1.9.0" & with-test} "odoc" {with-doc} ] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -36,6 +35,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml-tyxml.opam.template b/js_of_ocaml-tyxml.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml-tyxml.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] diff --git a/js_of_ocaml.opam b/js_of_ocaml.opam index 5425a5c0e8..6aca5f156d 100644 --- a/js_of_ocaml.opam +++ b/js_of_ocaml.opam @@ -21,7 +21,6 @@ depends: [ "re" {>= "1.9.0" & with-test} "odoc" {with-doc} ] -dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" build: [ ["dune" "subst"] {dev} [ @@ -32,6 +31,8 @@ build: [ "-j" jobs "@install" + "@runtest" {with-test} "@doc" {with-doc} ] ] +dev-repo: "git+https://github.com/ocsigen/js_of_ocaml.git" diff --git a/js_of_ocaml.opam.template b/js_of_ocaml.opam.template deleted file mode 100644 index 44877d421e..0000000000 --- a/js_of_ocaml.opam.template +++ /dev/null @@ -1,13 +0,0 @@ -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@doc" {with-doc} - ] -] From ed805f72de50e5a06214d89002f767691829d6b3 Mon Sep 17 00:00:00 2001 From: Sora Morimoto Date: Tue, 3 Dec 2024 14:29:34 +0900 Subject: [PATCH 2/2] Cleanup GHA workflow Signed-off-by: Sora Morimoto --- .github/workflows/build.yml | 83 ++++++++++--------------------------- 1 file changed, 21 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78ee7afaac..053f768afd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,10 +1,10 @@ name: build on: - pull_request: push: branches: - master + pull_request: schedule: # Prime the caches every Monday - cron: 0 1 * * MON @@ -23,62 +23,29 @@ jobs: - "4.11" - "4.12" - "4.13" + - "4.14" - "5.0" - "5.1" - skip-test: - - true - skip-doc: - - true - skip-effects: - - true + - "5.2" include: - - os: ubuntu-latest - ocaml-compiler: "4.14" - skip-effects: true - skip-test: false - skip-doc: true - - os: ubuntu-latest - ocaml-compiler: "ocaml-variants.4.14.2+options,ocaml-option-32bit" - skip-effects: true - skip-test: false - skip-doc: true - os: macos-latest ocaml-compiler: "4.14" - skip-effects: true - skip-test: false - skip-doc: true - os: windows-latest ocaml-compiler: "4.14" - skip-effects: true - skip-test: false - skip-doc: true - - os: ubuntu-latest - ocaml-compiler: "5.2" - skip-effects: false - skip-test: false - skip-doc: false - # Note this OCaml compiler is bytecode only - - os: ubuntu-latest - ocaml-compiler: "ocaml-variants.5.2.0+options,ocaml-option-32bit" - skip-effects: true # disabled for the same reason than `skip-test` - skip-test: true # the `time_now.0.17` package is pulled and doesn't work in 32 bits :( - skip-doc: true - os: macos-latest ocaml-compiler: "5.2" - skip-effects: true - skip-test: false - skip-doc: true - os: windows-latest ocaml-compiler: "5.2" - skip-effects: false - skip-test: false - skip-doc: true + - os: ubuntu-latest + ocaml-compiler: "ocaml-variants.4.14.2+options,ocaml-option-32bit" + - os: ubuntu-latest + ocaml-compiler: "ocaml-variants.5.2.1+options,ocaml-option-32bit" # Note this OCaml compiler is bytecode only runs-on: ${{ matrix.os }} steps: - name: Set git to use LF - if: matrix.ocaml-compiler < 5.2 + if: matrix.os == 'windows-latest' run: | git config --global core.autocrlf false git config --global core.eol lf @@ -88,7 +55,7 @@ jobs: # getting much better, but no luck yet, c.f: # https://github.com/ocaml/opam-repository/pull/26626 - name: Install apt 32-bit dependencies - if: contains( matrix.ocaml-compiler, 'ocaml-option-32bit') + if: contains(matrix.ocaml-compiler, 'ocaml-option-32bit') run: | sudo apt-get install aptitude sudo dpkg --add-architecture i386 @@ -109,41 +76,33 @@ jobs: uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - dune-cache: true - opam-pin: false - - - run: opam install conf-pkg-config - if: runner.os == 'Windows' - run: opam install . --best-effort - if: ${{ matrix.skip-test }} - - - run: opam install . --with-test - if: ${{ !matrix.skip-test }} + if: matrix.ocaml-compiler < 4.14 - - run: opam exec -- make all - if: ${{ !matrix.skip-test }} + - run: opam install . --deps-only --with-test --with-doc + if: matrix.ocaml-compiler >= 4.14 - - run: opam exec -- make tests - if: ${{ !matrix.skip-test }} + - run: opam exec -- dune build @all @runtest + if: matrix.ocaml-compiler >= 4.14 && matrix.ocaml-compiler < 5.0 - run: opam exec -- dune build @all @runtest --profile using-effects - if: ${{ !matrix.skip-effects }} + if: matrix.ocaml-compiler >= 5.0 - run: opam exec -- git diff --exit-code - if: ${{ !matrix.skip-test }} + if: matrix.ocaml-compiler >= 4.14 - - name: build doc - if: ${{ !matrix.skip-doc && github.event_name == 'push' && github.ref_name == 'master'}} + - name: Build doc + if: matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.2' && github.event_name == 'push' && github.ref_name == 'master' run: | opam install odoc lwt_log cohttp-lwt-unix yojson ocp-indent graphics higlo opam exec -- make doc - - name: synchronize doc - if: ${{ !matrix.skip-doc && github.event_name == 'push' && github.ref_name == 'master' }} + - name: Synchronize doc + if: matrix.os == 'ubuntu-latest' && matrix.ocaml-compiler == '5.2' && github.event_name == 'push' && github.ref_name == 'master' uses: JamesIves/github-pages-deploy-action@v4 with: branch: wikidoc folder: doc-dev clean: true - target-folder: doc/dev/ \ No newline at end of file + target-folder: doc/dev/