From 2c064096cc0ecd2817837020847cb03938e1cdad Mon Sep 17 00:00:00 2001 From: Alex Fedoseev Date: Thu, 11 Apr 2019 16:37:07 +0800 Subject: [PATCH] Uncomment windows build and reinstall deps --- .ci/azure-pipelines.yml | 12 +++--- .ci/release/bundle.yml | 22 +++++----- ppx.esy.lock/index.json | 40 +++++++++---------- .../opam/{dune.1.8.2 => dune.1.9.0}/opam | 4 +- ppx.esy.lock/opam/merlin-extend.0.3/opam | 2 +- .../package.json | 0 .../files/merlin-extend-winfix-4.2.3007.patch | 34 ++++++++++++++++ .../package.json | 5 ++- 8 files changed, 78 insertions(+), 41 deletions(-) rename ppx.esy.lock/opam/{dune.1.8.2 => dune.1.9.0}/opam (92%) rename ppx.esy.lock/overrides/{opam__s__dune_opam__c__1.8.2_opam_override => opam__s__dune_opam__c__1.9.0_opam_override}/package.json (100%) create mode 100644 ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index b775aab..7d259ae 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -16,11 +16,11 @@ jobs: vmImage: "ubuntu-16.04" platform: "Linux" - # - template: release/pipeline.yml - # parameters: - # name: "bs_log_Windows" - # vmImage: "vs2017-win2016" - # platform: "Windows" + - template: release/pipeline.yml + parameters: + name: "bs_log_Windows" + vmImage: "vs2017-win2016" + platform: "Windows" - job: bs_log_bundle pool: @@ -28,6 +28,6 @@ jobs: dependsOn: - bs_log_Linux - bs_log_macOS - # - bs_log_Windows + - bs_log_Windows steps: - template: release/bundle.yml diff --git a/.ci/release/bundle.yml b/.ci/release/bundle.yml index a7bc2a5..13ebb8e 100644 --- a/.ci/release/bundle.yml +++ b/.ci/release/bundle.yml @@ -28,17 +28,17 @@ steps: - script: "mv _release/macOS/bin.exe _release/bin/platform-darwin/bin.exe" displayName: "mv macOS" - # - task: DownloadBuildArtifacts@0 - # displayName: "Download Windows Artifacts" - # inputs: - # artifactName: Windows - # downloadPath: "_release" - # - # - script: "mkdir -p _release/bin/platform-windows-x64" - # displayName: "Create _release/bin/platform-windows-x64" - # - # - script: "mv _release/Windows/bin.exe _release/bin/platform-windows-x64/bin.exe" - # displayName: "mv Windows" + - task: DownloadBuildArtifacts@0 + displayName: "Download Windows Artifacts" + inputs: + artifactName: Windows + downloadPath: "_release" + + - script: "mkdir -p _release/bin/platform-windows-x64" + displayName: "Create _release/bin/platform-windows-x64" + + - script: "mv _release/Windows/bin.exe _release/bin/platform-windows-x64/bin.exe" + displayName: "mv Windows" - script: | mkdir -p _release/src diff --git a/ppx.esy.lock/index.json b/ppx.esy.lock/index.json index d6f3a1c..e0bda25 100644 --- a/ppx.esy.lock/index.json +++ b/ppx.esy.lock/index.json @@ -15,7 +15,7 @@ "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/re@opam:1.8.0@7baac1a7", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/reason@3.4.0@d41d8cd9" + "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/reason@3.4.0@d41d8cd9" ], "devDependencies": [] }, @@ -56,7 +56,7 @@ "dependencies": [ "refmterr@3.1.10@d41d8cd9", "ocaml@4.2.3007@d41d8cd9", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/reason@3.4.0@d41d8cd9", + "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/reason@3.4.0@d41d8cd9", "@esy-ocaml/esy-installer@0.0.1@d41d8cd9" ], "devDependencies": [ "@opam/merlin@opam:3.2.2@829ee6dd" ] @@ -80,7 +80,7 @@ "overrides": [], "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/easy-format@opam:1.3.1@9abfd4ed", - "@opam/dune@opam:1.8.2@511996a8", "@opam/cppo@opam:1.6.5@bec3dbd9", + "@opam/dune@opam:1.9.0@a7408d38", "@opam/cppo@opam:1.6.5@bec3dbd9", "@opam/biniou@opam:1.2.0@c8516f18", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], @@ -180,7 +180,7 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9" ] @@ -257,15 +257,15 @@ "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", "@opam/ppx_derivers@opam:1.2.1@0b458500", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", "@opam/ppx_derivers@opam:1.2.1@0b458500" ] }, - "@opam/merlin-extend@opam:0.3@e1fc0d08": { - "id": "@opam/merlin-extend@opam:0.3@e1fc0d08", + "@opam/merlin-extend@opam:0.3@0af73a50": { + "id": "@opam/merlin-extend@opam:0.3@0af73a50", "name": "@opam/merlin-extend", "version": "opam:0.3", "source": { @@ -312,7 +312,7 @@ "dependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e", "@opam/ocamlfind@opam:1.8.0@f744a0c5", - "@opam/dune@opam:1.8.2@511996a8", "@esy-ocaml/substs@0.0.1@d41d8cd9" + "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9", "@opam/yojson@opam:1.7.0@2d92307e", @@ -365,11 +365,11 @@ }, "overrides": [], "dependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8", + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38", "@esy-ocaml/substs@0.0.1@d41d8cd9" ], "devDependencies": [ - "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.8.2@511996a8" + "ocaml@4.2.3007@d41d8cd9", "@opam/dune@opam:1.9.0@a7408d38" ] }, "@opam/easy-format@opam:1.3.1@9abfd4ed": { @@ -395,26 +395,26 @@ ], "devDependencies": [ "ocaml@4.2.3007@d41d8cd9" ] }, - "@opam/dune@opam:1.8.2@511996a8": { - "id": "@opam/dune@opam:1.8.2@511996a8", + "@opam/dune@opam:1.9.0@a7408d38": { + "id": "@opam/dune@opam:1.9.0@a7408d38", "name": "@opam/dune", - "version": "opam:1.8.2", + "version": "opam:1.9.0", "source": { "type": "install", "source": [ - "archive:https://opam.ocaml.org/cache/md5/2b/2b7f45a6e14865f2318d34f12221ec1e#md5:2b7f45a6e14865f2318d34f12221ec1e", - "archive:https://github.com/ocaml/dune/releases/download/1.8.2/dune-1.8.2.tbz#md5:2b7f45a6e14865f2318d34f12221ec1e" + "archive:https://opam.ocaml.org/cache/md5/73/732b2d9d273b3e3d8472a8094ec2e1ad#md5:732b2d9d273b3e3d8472a8094ec2e1ad", + "archive:https://github.com/ocaml/dune/releases/download/1.9.0/dune-1.9.0.tbz#md5:732b2d9d273b3e3d8472a8094ec2e1ad" ], "opam": { "name": "dune", - "version": "1.8.2", - "path": "ppx.esy.lock/opam/dune.1.8.2" + "version": "1.9.0", + "path": "ppx.esy.lock/opam/dune.1.9.0" } }, "overrides": [ { "opamoverride": - "ppx.esy.lock/overrides/opam__s__dune_opam__c__1.8.2_opam_override" + "ppx.esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override" } ], "dependencies": [ @@ -596,9 +596,9 @@ "ocaml@4.2.3007@d41d8cd9", "@opam/result@opam:1.3@bee8bf2e", "@opam/ocamlfind@opam:1.8.0@f744a0c5", "@opam/ocaml-migrate-parsetree@opam:1.2.0@23e55f71", - "@opam/merlin-extend@opam:0.3@e1fc0d08", + "@opam/merlin-extend@opam:0.3@0af73a50", "@opam/menhir@opam:20171013@e2d3ef03", - "@opam/dune@opam:1.8.2@511996a8" + "@opam/dune@opam:1.9.0@a7408d38" ], "devDependencies": [] }, diff --git a/ppx.esy.lock/opam/dune.1.8.2/opam b/ppx.esy.lock/opam/dune.1.9.0/opam similarity index 92% rename from ppx.esy.lock/opam/dune.1.8.2/opam rename to ppx.esy.lock/opam/dune.1.9.0/opam index 3e1720a..5f42c05 100644 --- a/ppx.esy.lock/opam/dune.1.8.2/opam +++ b/ppx.esy.lock/opam/dune.1.9.0/opam @@ -42,6 +42,6 @@ packages across several versions of OCaml and gives cross-compilation for free. """ url { - src: "https://github.com/ocaml/dune/releases/download/1.8.2/dune-1.8.2.tbz" - checksum: "md5=2b7f45a6e14865f2318d34f12221ec1e" + src: "https://github.com/ocaml/dune/releases/download/1.9.0/dune-1.9.0.tbz" + checksum: "md5=732b2d9d273b3e3d8472a8094ec2e1ad" } diff --git a/ppx.esy.lock/opam/merlin-extend.0.3/opam b/ppx.esy.lock/opam/merlin-extend.0.3/opam index db2b130..03ed72e 100644 --- a/ppx.esy.lock/opam/merlin-extend.0.3/opam +++ b/ppx.esy.lock/opam/merlin-extend.0.3/opam @@ -9,7 +9,7 @@ build: [make] install: [make "install"] remove: ["ocamlfind" "remove" "merlin_extend"] depends: [ - "ocaml" {>= "4.02.3"} + "ocaml" {>= "4.02.3" & < "4.08.0"} "ocamlfind" {build} "cppo" {build} ] diff --git a/ppx.esy.lock/overrides/opam__s__dune_opam__c__1.8.2_opam_override/package.json b/ppx.esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override/package.json similarity index 100% rename from ppx.esy.lock/overrides/opam__s__dune_opam__c__1.8.2_opam_override/package.json rename to ppx.esy.lock/overrides/opam__s__dune_opam__c__1.9.0_opam_override/package.json diff --git a/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch b/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch new file mode 100644 index 0000000..1e59ebb --- /dev/null +++ b/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/files/merlin-extend-winfix-4.2.3007.patch @@ -0,0 +1,34 @@ +--- ./extend_helper.ml ++++ ./extend_helper.ml +@@ -1,13 +1,6 @@ +-(*pp cppo -V OCAML:`ocamlc -version` *) + open Parsetree + open Extend_protocol + +-#if OCAML_VERSION < (4, 3, 0) +-# define CONST_STRING Asttypes.Const_string +-#else +-# define CONST_STRING Parsetree.Pconst_string +-#endif +- + (** Default implementation for [Reader_def.print_outcome] using + [Oprint] from compiler-libs *) + let print_outcome_using_oprint ppf = function +@@ -28,7 +21,7 @@ + pstr_loc = Location.none; + pstr_desc = Pstr_eval ({ + pexp_loc = Location.none; +- pexp_desc = Pexp_constant (CONST_STRING (msg, None)); ++ pexp_desc = Pexp_constant (Asttypes.Const_string (msg, None)); + pexp_attributes = []; + }, []); + }] +@@ -112,7 +105,7 @@ + let msg = match payload with + | PStr [{ + pstr_desc = Pstr_eval ({ +- pexp_desc = Pexp_constant (CONST_STRING (msg, _)); ++ pexp_desc = Pexp_constant (Asttypes.Const_string (msg, _)); + }, _); + }] -> msg + | _ -> "Warning: extension produced an incorrect syntax-error node" diff --git a/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json b/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json index 1675df2..acc90eb 100644 --- a/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json +++ b/ppx.esy.lock/overrides/opam__s__merlin_extend_opam__c__0.3_opam_override/package.json @@ -1,9 +1,12 @@ { + "buildEnv": { + "PATCH_CMD": "#{ocaml.version == '4.2.3007' ? 'patch -p1 < merlin-extend-winfix-4.2.3007.patch' : 'patch -p1 < merlin-extend-winfix.patch'}" + }, "build": [ [ "bash", "-c", - "#{os == 'windows' ? 'patch -p1 < merlin-extend-winfix.patch' : 'true'}" + "#{os == 'windows' ? $PATCH_CMD : 'true'}" ], [ "make"