From c876676042bb3683e7235a543b561e61e23f2ad1 Mon Sep 17 00:00:00 2001
From: Terry Kim <yuminkim@gmail.com>
Date: Tue, 26 Jan 2021 18:30:35 -0800
Subject: [PATCH 1/2] Update azure-pipelines.yml

---
 azure-pipelines.yml | 83 ++++++++++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 23 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 665f03c3d..0ee8f579b 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -6,34 +6,52 @@ trigger:
       - master
 
 jobs:
-  - job: Build
-    displayName: 'Build sources and run unit tests'
+  - job: Build_2_11
+    displayName: 'Build sources and run unit tests for Scala 2.11'
     pool:
       vmImage: 'ubuntu-latest'
     steps:
-      - script: sbt +clean
-        displayName: 'Running $sbt +clean'
-      - script: sbt +update
-        displayName: 'Running $sbt +update'
-      - script: sbt +compile
-        displayName: 'Running $sbt +compile'
-      - script: sbt +test
-        displayName: 'Running $sbt +test'
-      - task: Bash@3
-        inputs:
-          filePath: 'script/download_spark.sh'
-        displayName: 'Downloading spark'
-      - task: PythonScript@0
-        inputs:
-          scriptSource: 'filePath'
-          scriptPath: 'run-tests.py'
-        displayName: 'Running python tests'
-        env:
-          SPARK_HOME: $(Build.SourcesDirectory)/spark-2.4.2-bin-hadoop2.7
+      - script: sbt ++2.11.12 clean
+        displayName: 'Running $sbt clean'
+      - script: sbt ++2.11.12 update
+        displayName: 'Running $sbt update'
+      - script: sbt ++2.11.12 compile
+        displayName: 'Running $sbt compile'
+      - script: sbt ++2.11.12 test
+        displayName: 'Running $sbt test'
+      # If not a pull request, publish artifacts.
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+        - script: sbt ++2.11.12 package
+          displayName: 'Running $sbt package'
+        - task: CopyFiles@2
+          displayName: 'Copy hyperspace-core JAR'
+          inputs:
+            sourceFolder: '$(Build.SourcesDirectory)/target/'
+            contents: '**/*.jar'
+            targetFolder: '$(Build.ArtifactStagingDirectory)/hyperspace-core/'
+        - task: PublishBuildArtifacts@1
+          displayName: 'Publish Hyperspace artifacts'
+          inputs:
+            artifactName: 'hyperspace-core'
+            pathtoPublish: '$(Build.ArtifactStagingDirectory)/hyperspace-core/'
+
+  - job: Build_2_12
+    displayName: 'Build sources and run unit tests for Scala 2.12'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
+      - script: sbt ++2.12.8 clean
+        displayName: 'Running $sbt clean'
+      - script: sbt ++2.12.8 update
+        displayName: 'Running $sbt update'
+      - script: sbt ++2.12.8 compile
+        displayName: 'Running $sbt compile'
+      - script: sbt ++2.12.8 test
+        displayName: 'Running $sbt test'
       # If not a pull request, publish artifacts.
       - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-        - script: sbt +package
-          displayName: 'Running $sbt +package'
+        - script: sbt ++2.12.8 package
+          displayName: 'Running $sbt package'
         - task: CopyFiles@2
           displayName: 'Copy hyperspace-core JAR'
           inputs:
@@ -45,3 +63,22 @@ jobs:
           inputs:
             artifactName: 'hyperspace-core'
             pathtoPublish: '$(Build.ArtifactStagingDirectory)/hyperspace-core/'
+
+    - job: PythonTest
+      - script: sbt ++2.11.12 clean
+        displayName: 'Running $sbt clean'
+      - script: sbt ++2.11.12 update
+        displayName: 'Running $sbt update'
+      - script: sbt ++2.11.12 compile
+        displayName: 'Running $sbt compile'
+      - task: Bash@3
+        inputs:
+          filePath: 'script/download_spark.sh'
+        displayName: 'Downloading spark'
+      - task: PythonScript@0
+        inputs:
+          scriptSource: 'filePath'
+          scriptPath: 'run-tests.py'
+        displayName: 'Running python tests'
+        env:
+          SPARK_HOME: $(Build.SourcesDirectory)/spark-2.4.2-bin-hadoop2.7

From de91bed1771ae29e8f885e869d2ff8383d799ee3 Mon Sep 17 00:00:00 2001
From: Terry Kim <yuminkim@gmail.com>
Date: Tue, 26 Jan 2021 18:35:57 -0800
Subject: [PATCH 2/2] Update azure-pipelines.yml

---
 azure-pipelines.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0ee8f579b..c193e0ab7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -64,7 +64,11 @@ jobs:
             artifactName: 'hyperspace-core'
             pathtoPublish: '$(Build.ArtifactStagingDirectory)/hyperspace-core/'
 
-    - job: PythonTest
+  - job: PythonTest
+    displayName: 'Run Python tests'
+    pool:
+      vmImage: 'ubuntu-latest'
+    steps:
       - script: sbt ++2.11.12 clean
         displayName: 'Running $sbt clean'
       - script: sbt ++2.11.12 update