diff --git a/.ci/esy-build-steps.yml b/.ci/esy-build-steps.yml
index 3c9fffa..bbf14f2 100644
--- a/.ci/esy-build-steps.yml
+++ b/.ci/esy-build-steps.yml
@@ -4,6 +4,22 @@ steps:
   - task: NodeTool@0
     inputs:
       versionSpec: '8.9'
-  - script: npm install -g esy@0.3.4
+  - script: git submodule update --init
+    displayName: 'git submodule update --init'
+  - script: npm install -g esy@0.6.6
+    displayName: 'npm install -g esy@0.6.6'
   - script: esy install
+    displayName: 'esy install'
+  - script: esy build-env
+    displayName: 'esy build-env'
   - script: esy build
+    displayName: 'esy build --verbosity=debug'
+    env:
+      ESY__LOG: 'debug'
+  - task: PublishBuildArtifacts@1
+    displayName: Publish log
+    condition: and(failed(), eq(variables['Agent.OS'], 'Windows_NT'))
+    inputs:
+      pathToPublish: "C:\\npm\\cache\\_logs"
+      artifactName: log
+      artifactType: container
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aa91291..1f75fbf 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,19 +1,30 @@
-# Starter pipeline
-# Start with a minimal pipeline that you can customize to build and deploy your code.
-# Add steps that build, run tests, deploy, and more:
-# https://aka.ms/yaml
+# Cross-platform build pipeline + NPM publish
 
-trigger:
-- master
+name: $(Build.SourceVersion)
+jobs:
+- job: Linux
+  displayName: "Linux - Ubuntu 16.04"
+  pool:
+    vmImage: 'Ubuntu 16.04'
+  steps:
+  - template: .ci/esy-build-steps.yml
 
-pool:
-  vmImage: 'ubuntu-latest'
+- job: MacOS14
+  displayName: "MacOS High Sierra"
+  pool:
+    vmImage: 'macOS-10.14'
+  steps:
+  - template: .ci/esy-build-steps.yml
 
-steps:
-- script: echo Hello, world!
-  displayName: 'Run a one-line script'
+- job: MacOS15
+  displayName: "MacOS Catalina"
+  pool:
+    vmImage: 'macOS-10.15'
+  steps:
+  - template: .ci/esy-build-steps.yml
 
-- script: |
-    echo Add other tasks to build, test, and deploy your project.
-    echo See https://aka.ms/yaml
-  displayName: 'Run a multi-line script'
+- job: Windows
+  pool:
+    vmImage: 'vs2017-win2016'
+  steps:
+  - template: .ci/esy-build-steps.yml
diff --git a/build-windows.sh b/build-windows.sh
index e328ed5..f0f5c0d 100755
--- a/build-windows.sh
+++ b/build-windows.sh
@@ -1,3 +1,5 @@
+set -x
+
 if cmake.exe --version; then
     echo "cmake already in path..."
 else
@@ -20,4 +22,11 @@ else
 
     echo "Copying to $cur__share/$CMAKE_DIRNAME"
     cp -r $CMAKE_FOLDER $cur__share/$CMAKE_DIRNAME
+
+    echo "Checking cmake version (/usr/bin):"
+    OUTPUT="$(/usr/bin/cmake.exe --version)"
+    echo "/usr/bin version is: $OUTPUT"
+
+    echo "Checking cmake version (copied):"
+    strace $cur__bin/cmake.exe
 fi
diff --git a/package.json b/package.json
index 8afaec3..810ac1f 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,8 @@
   "esy": {
     "build": [
         ["bash", "-c",  "#{os == 'windows' ? './build-windows.sh' : './build.sh'}"],
-        ["ls", "-a", "#{self.bin}"]
+        ["ls", "-a", "#{self.bin}"],
+        ["cmake", "--version"]
     ],
     "buildsInSource": "_build"
   },