From 9fa98c1200a5bdd238aa2db3d76a5dfb6902905c Mon Sep 17 00:00:00 2001 From: Emilien Lemaire Date: Mon, 3 Jul 2023 17:00:43 +0200 Subject: [PATCH] Edit workflow --- .drom | 29 +++++++++++-------- .github/workflows/workflow.yml | 8 ++--- drom.toml | 5 +--- src/interop-js-stubs/package.toml | 7 +++++ src/node-js-stubs/package.toml | 7 +++++ src/polka-js-stubs/package.toml | 7 +++++ src/superbol-vscode-platform/package.toml | 11 +++++-- src/vscode-debugadapter/package.toml | 11 +++++-- src/vscode-debugprotocol/package.toml | 7 +++++ src/vscode-js-stubs/package.toml | 7 +++++ src/vscode-json/package.toml | 7 +++++ .../package.toml | 7 +++++ src/vscode-package-json/package.toml | 7 +++++ 13 files changed, 95 insertions(+), 25 deletions(-) diff --git a/.drom b/.drom index c19e4165c..b01cfbc90 100644 --- a/.drom +++ b/.drom @@ -5,12 +5,12 @@ version:0.9.0 # hash of toml configuration files # used for generation of all files -06e69f2ac1e316dc1072dce9904d4024:. +02ec1db03cfcdaa26f420861e4cbbada:. # end context for . # begin context for .github/workflows/workflow.yml # file .github/workflows/workflow.yml -979fc90fae2cebf7cd9fbb37b430ee9d:.github/workflows/workflow.yml +c292de7b316672163c8e4e7dea9f4d62:.github/workflows/workflow.yml # end context for .github/workflows/workflow.yml # begin context for .gitignore @@ -70,7 +70,7 @@ c8281f46ba9a11d0b61bc8ef67eaa357:docs/style.css # begin context for drom.toml # file drom.toml -3c2a1a521cf8f4b07b1e6e327df0d658:drom.toml +993ba9bf5caea5d4ea944358649139a3:drom.toml # end context for drom.toml # begin context for dune @@ -200,7 +200,7 @@ f4bbb4a41a8b3b39f19a4fc62a5f4841:sphinx/license.rst # begin context for src/interop-js-stubs/package.toml # file src/interop-js-stubs/package.toml -62f580ba051b12170fdbbfdf48bdb582:src/interop-js-stubs/package.toml +cbce59b282479c51946165a86e98583e:src/interop-js-stubs/package.toml # end context for src/interop-js-stubs/package.toml # begin context for src/interop-js-stubs/version.mlt @@ -215,7 +215,7 @@ cf30d5557250e864c9020afd9e2389fd:src/node-js-stubs/dune # begin context for src/node-js-stubs/package.toml # file src/node-js-stubs/package.toml -ef3cf79ffac908adb72a39479dd2180f:src/node-js-stubs/package.toml +09a788f8a36173eefb4ea91caf00a4ec:src/node-js-stubs/package.toml # end context for src/node-js-stubs/package.toml # begin context for src/node-js-stubs/version.mlt @@ -230,7 +230,7 @@ ef3cf79ffac908adb72a39479dd2180f:src/node-js-stubs/package.toml # begin context for src/polka-js-stubs/package.toml # file src/polka-js-stubs/package.toml -eb4972ad4695584f2622f6743e567c8c:src/polka-js-stubs/package.toml +a7d6afd419b3a2cc0b4b8c9df2a8e70c:src/polka-js-stubs/package.toml # end context for src/polka-js-stubs/package.toml # begin context for src/polka-js-stubs/version.mlt @@ -243,6 +243,11 @@ eb4972ad4695584f2622f6743e567c8c:src/polka-js-stubs/package.toml f336ca790e61d4cc6371e8501b902bbd:src/superbol-vscode-platform/dune # end context for src/superbol-vscode-platform/dune +# begin context for src/superbol-vscode-platform/package.toml +# file src/superbol-vscode-platform/package.toml +52a57c098d260447652f7f0beb2872bc:src/superbol-vscode-platform/package.toml +# end context for src/superbol-vscode-platform/package.toml + # begin context for src/superbol-vscode-platform/version.mlt # file src/superbol-vscode-platform/version.mlt 940d29cde7f16cd0916ed1d5f9c41154:src/superbol-vscode-platform/version.mlt @@ -255,7 +260,7 @@ f336ca790e61d4cc6371e8501b902bbd:src/superbol-vscode-platform/dune # begin context for src/vscode-debugadapter/package.toml # file src/vscode-debugadapter/package.toml -cc234a8b5200f017fd1961975d510d07:src/vscode-debugadapter/package.toml +dc0d8943797599850bd0180ffadaadaa:src/vscode-debugadapter/package.toml # end context for src/vscode-debugadapter/package.toml # begin context for src/vscode-debugadapter/version.mlt @@ -270,7 +275,7 @@ cc234a8b5200f017fd1961975d510d07:src/vscode-debugadapter/package.toml # begin context for src/vscode-debugprotocol/package.toml # file src/vscode-debugprotocol/package.toml -b5bf94b5cb3cd205d4ddd3f62508bcdd:src/vscode-debugprotocol/package.toml +f14b34b55e33de7475b9c54938fec6d7:src/vscode-debugprotocol/package.toml # end context for src/vscode-debugprotocol/package.toml # begin context for src/vscode-debugprotocol/version.mlt @@ -285,7 +290,7 @@ f8e015ab8ad6d1dc7c7c8d63c86e446d:src/vscode-js-stubs/dune # begin context for src/vscode-js-stubs/package.toml # file src/vscode-js-stubs/package.toml -612682ce954f846f42377adf140924bf:src/vscode-js-stubs/package.toml +ebc05174a1892c2e98fe8aee174b5cb9:src/vscode-js-stubs/package.toml # end context for src/vscode-js-stubs/package.toml # begin context for src/vscode-js-stubs/version.mlt @@ -305,7 +310,7 @@ a18d965350ea19e9be91b3784887f1ef:src/vscode-json/dune # begin context for src/vscode-json/package.toml # file src/vscode-json/package.toml -1bdc2eac995762dd30e7bbbdd0052899:src/vscode-json/package.toml +9b831fff3824e035b2d9ef1696f89361:src/vscode-json/package.toml # end context for src/vscode-json/package.toml # begin context for src/vscode-json/version.mlt @@ -320,7 +325,7 @@ a18d965350ea19e9be91b3784887f1ef:src/vscode-json/dune # begin context for src/vscode-languageclient-js-stubs/package.toml # file src/vscode-languageclient-js-stubs/package.toml -2a6a70c35ba3e8bd142b1e7bf2bb8acc:src/vscode-languageclient-js-stubs/package.toml +553168fe21b0362e0d450c5de7f4216e:src/vscode-languageclient-js-stubs/package.toml # end context for src/vscode-languageclient-js-stubs/package.toml # begin context for src/vscode-languageclient-js-stubs/version.mlt @@ -340,7 +345,7 @@ a18d965350ea19e9be91b3784887f1ef:src/vscode-json/dune # begin context for src/vscode-package-json/package.toml # file src/vscode-package-json/package.toml -c767433784f32418d725ed53b301cb27:src/vscode-package-json/package.toml +4b3c04a3df2a4be1259088d71bc55846:src/vscode-package-json/package.toml # end context for src/vscode-package-json/package.toml # begin context for src/vscode-package-json/version.mlt diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index c059e2501..3e8f6ccad 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -37,16 +37,14 @@ jobs: id: cache-opam with: path: ~/.opam - key: v2-${{ runner.os }}-superbol-vscode-extension-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }} + key: v2-${{ runner.os }}-superbol-vscode-platform-${{ matrix.ocaml-compiler }}-${{ hashFiles('opam/*.opam') }} # restore-keys: | # v2-${{ runner.os }}-opam-${{ matrix.ocaml-compiler }}- - name: Use OCaml ${{ matrix.ocaml-compiler }} - uses: avsm/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v2 with: ocaml-compiler: ${{ matrix.ocaml-compiler }} - opam-repositories: | - default: https://github.com/ocaml/opam-repository.git opam-pin: false opam-depext: false @@ -59,7 +57,7 @@ jobs: - run: opam pin add . -y --no-action - - run: opam depext -y superbol-vscode-extension polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol + - run: opam depext -y superbol-vscode-platform polka-js-stubs interop-js-stubs node-js-stubs vscode-js-stubs vscode-languageclient-js-stubs vscode-package-json vscode-json vscode-debugadapter vscode-debugprotocol if: matrix.os != 'windows-latest' # if: steps.cache-opam.outputs.cache-hit != 'true' diff --git a/drom.toml b/drom.toml index 69e49f973..bd08436d3 100644 --- a/drom.toml +++ b/drom.toml @@ -4,10 +4,7 @@ share-repo = "https://github.com/OCamlPro/drom-share" share-version = "0.9.2" [project] -authors = [ - "Fabrice Le Fessant ", - "Emilien Lemaire " -] +authors = ["Fabrice Le Fessant ", "Emilien Lemaire "] ci-systems = ["ubuntu-latest", "macos-latest", "windows-latest"] copyright = "OCamlPro SAS" edition = "4.13.0" diff --git a/src/interop-js-stubs/package.toml b/src/interop-js-stubs/package.toml index 9959c2035..d205d8cc3 100644 --- a/src/interop-js-stubs/package.toml +++ b/src/interop-js-stubs/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/node-js-stubs/package.toml b/src/node-js-stubs/package.toml index 1be498dd1..9ab836386 100644 --- a/src/node-js-stubs/package.toml +++ b/src/node-js-stubs/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/polka-js-stubs/package.toml b/src/polka-js-stubs/package.toml index 19da579c3..db7f194af 100644 --- a/src/polka-js-stubs/package.toml +++ b/src/polka-js-stubs/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/superbol-vscode-platform/package.toml b/src/superbol-vscode-platform/package.toml index a577bb6b3..6c8b6b62a 100644 --- a/src/superbol-vscode-platform/package.toml +++ b/src/superbol-vscode-platform/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false @@ -49,10 +56,10 @@ skip = [] gen_js_api = "1.1.1" js_of_ocaml = ">=4" jsonoo = "0.2.1" -promise_jsoo = "0.3.1" -ocplib_stuff = "0.4.0" node-js-stubs = "version" +ocplib_stuff = "0.4.0" polka-js-stubs = "version" +promise_jsoo = "0.3.1" vscode-js-stubs = "version" vscode-languageclient-js-stubs = "version" diff --git a/src/vscode-debugadapter/package.toml b/src/vscode-debugadapter/package.toml index 115633b4d..d9c880923 100644 --- a/src/vscode-debugadapter/package.toml +++ b/src/vscode-debugadapter/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false @@ -48,11 +55,11 @@ skip = ["main.ml"] [dependencies] gen_js_api = "1.1.1" interop-js-stubs = "version" -vscode-debugprotocol = "version" -node-js-stubs = "version" js_of_ocaml = ">=4" jsonoo = "0.2.1" +node-js-stubs = "version" promise_jsoo = "0.3.1" +vscode-debugprotocol = "version" # package tools dependencies [tools] diff --git a/src/vscode-debugprotocol/package.toml b/src/vscode-debugprotocol/package.toml index 65eb64791..1e9a74e37 100644 --- a/src/vscode-debugprotocol/package.toml +++ b/src/vscode-debugprotocol/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/vscode-js-stubs/package.toml b/src/vscode-js-stubs/package.toml index 9a8965f88..c50d21f53 100644 --- a/src/vscode-js-stubs/package.toml +++ b/src/vscode-js-stubs/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/vscode-json/package.toml b/src/vscode-json/package.toml index a052c45e1..912eb2057 100644 --- a/src/vscode-json/package.toml +++ b/src/vscode-json/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/vscode-languageclient-js-stubs/package.toml b/src/vscode-languageclient-js-stubs/package.toml index cda15b825..cd5553b7c 100644 --- a/src/vscode-languageclient-js-stubs/package.toml +++ b/src/vscode-languageclient-js-stubs/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false diff --git a/src/vscode-package-json/package.toml b/src/vscode-package-json/package.toml index a6e93f617..9c7e42f8a 100644 --- a/src/vscode-package-json/package.toml +++ b/src/vscode-package-json/package.toml @@ -25,6 +25,13 @@ gen-version = "version.ml" # default is [ "ocamllex", "ocamlyacc" ] # generators = [ "ocamllex", "menhir" ] +# menhir options for the package +#Example: +#version = "2.0" +#parser = { modules = ["parser"]; tokens = "Tokens" } +#tokens = { modules = ["tokens"]} +# menhir = ... + # whether all modules should be packed/wrapped (default is true) # pack-modules = false