Merge pull request #55 from esy/prometheansacrifice/prepare-alpha-6-r…

…elease Prepare alpha 6 release
esy · Sep 23, 2019 · 885901a · 885901a
2 parents 74ac4fe + 2f32c8c
commit 885901a
Show file tree

Hide file tree

Showing 43 changed files with 157 additions and 637 deletions.
diff --git a/.ci/checksum.js b/.ci/checksum.js
@@ -8,7 +8,11 @@ let algorithm = "sha1",
 let cwd = process.cwd();
 let pkg = require(path.join(cwd, "package.json")),
   s = fs.ReadStream(
-    path.join(cwd, "_release", `${pkg.name}-${pkg.version}.tgz`)
+    path.join(
+      cwd,
+      "_release",
+      `${pkg.name.replace("@", "").replace("/", "-")}-${pkg.version}.tgz`
+    )
   );
 
 s.on("data", function(data) {

diff --git a/.ci/cross-release.yml b/.ci/cross-release.yml
@@ -27,7 +27,7 @@ steps:
     displayName: "npm pack"
     workingDirectory: "_release"
 
-  - bash: "node .ci/checksum.js _release/pesy-0.5.0-alpha.2.tgz"
+  - bash: "node .ci/checksum.js _release/pesy-0.5.0-alpha.6.tgz"
     displayName: "Calculating sha1"
 
   - task: PublishBuildArtifacts@1

diff --git a/assets/azure-pipeline-templates/pesy-azure-pipelines.yml b/assets/azure-pipeline-templates/pesy-azure-pipelines.yml
diff --git a/assets/azure-pipeline-templates/pesy-esy-build-steps.template.yml b/assets/azure-pipeline-templates/pesy-esy-build-steps.template.yml
diff --git a/assets/azure-pipeline-templates/pesy-publish-build-cache.yml b/assets/azure-pipeline-templates/pesy-publish-build-cache.yml
diff --git a/assets/azure-pipeline-templates/pesy-restore-build-cache.yml b/assets/azure-pipeline-templates/pesy-restore-build-cache.yml
diff --git a/assets/dune b/assets/dune
diff --git a/assets/pesy-App.template.re b/assets/pesy-App.template.re
diff --git a/assets/pesy-README.template.md b/assets/pesy-README.template.md
diff --git a/assets/pesy-RunTests.template.re b/assets/pesy-RunTests.template.re
diff --git a/assets/pesy-Test.template.re b/assets/pesy-Test.template.re
diff --git a/assets/pesy-TestFramework.template.re b/assets/pesy-TestFramework.template.re
diff --git a/assets/pesy-Util.template.re b/assets/pesy-Util.template.re
diff --git a/assets/pesy-gitignore.template b/assets/pesy-gitignore.template
diff --git a/assets/pesy-package.template.json b/assets/pesy-package.template.json
diff --git a/bin/Pesy.re b/bin/Pesy.re
@@ -226,7 +226,7 @@ let pesy_build = () =>
     )
   );
 
-let version = "0.5.0-alpha.5";
+let version = "0.5.0-alpha.6";
 
 let cmd = () => {
   open Cmdliner.Term;

diff --git a/bin/dune b/bin/dune
@@ -1,2 +1,3 @@
 (executable (name Pesy) (public_name pesy)
-    (libraries pesy.lib pesy.utils cmdliner findlib)) 
+    (libraries pesy--esy-pesy.lib
+        pesy--esy-pesy.utils cmdliner findlib)) 
diff --git a/e2e-tests/Runner.re b/e2e-tests/Runner.re
@@ -28,9 +28,11 @@ let run = (~env=?, c, args) => {
 
 chdir(Path.(cwd / "npm-cli"));
 print_endline("Installing pesy globally..");
+run(makeCommand("npm"), [|"install"|]);
+run(makeCommand("npm"), [|"run", "build"|]);
 run(makeCommand("npm"), [|"run", "rollup"|]);
 run(makeCommand("npm"), [|"pack"|]);
-run(makeCommand("npm"), [|"i", "-g", "./pesy-0.5.0-alpha.5.tgz"|]);
+run(makeCommand("npm"), [|"i", "-g", "./pesy-0.5.0-alpha.6.tgz"|]);
 chdir(cwd);
 
 let testBootstrapperExe =

diff --git a/e2e-tests/dune b/e2e-tests/dune
@@ -1,6 +1,6 @@
 (executables
 (names Runner TestBootstrapper TestPesyConfigure)
 (public_names Runner.exe TestBootstrapper.exe TestPesyConfigure.exe)
-(libraries unix pesy.lib))
+(libraries unix pesy--esy-pesy.lib))
 
 (data_only_dirs pesy-configure-test-projects)