Restore Build steps

satyapoojasama · Jun 6, 2020 · 95635ce · 95635ce
1 parent dbd05dc
commit 95635ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/Tools/Gulp/tasks/gulpTasks-libraries.js b/Tools/Gulp/tasks/gulpTasks-libraries.js
@@ -214,10 +214,4 @@ gulp.task("core-workers", buildExternalLibraries(config["core"], true));
 /**
  * Build all libs.
  */
-gulp.task("typescript-libraries", gulp.series(config.modules));
-
-
-/**
- * Build viewer libs temp until fix.
- */
-gulp.task("typescript-viewer-libraries", gulp.series(["typescript-libraries"], config.viewerModules));
+gulp.task("typescript-libraries", gulp.series(config.modules, config.viewerModules));
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -174,23 +174,8 @@ jobs:
       testRunner: JUnit
       testResultsFiles: '.temp/testResults/ModuleTestsWebpack.xml'
 
-- job: ViewerBuild
-  displayName: '8. Viewer Build'
-  pool:
-    vmImage: 'Ubuntu-16.04'
-    demands: npm
-  steps:
-  - task: Npm@1
-    displayName: 'npm install'
-    inputs:
-      workingDir: Tools/Gulp
-      verbose: false
-  - script: 'gulp typescript-viewer-libraries --max-old-space-size=8192'
-    workingDirectory: Tools/Gulp
-    displayName: 'Typescript all'
-
 - job: ViewerTests
-  displayName: '9. Viewer Tests'
+  displayName: '8. Viewer Tests'
   pool:
     vmImage: 'Ubuntu-16.04'
     demands: npm
@@ -200,7 +185,7 @@ jobs:
     inputs:
       workingDir: Tools/Gulp
       verbose: false
-  - script: 'gulp typescript-viewer-libraries --max-old-space-size=8192'
+  - script: 'gulp typescript-all --max-old-space-size=8192'
     workingDirectory: Tools/Gulp
     displayName: 'Typescript all'
   - script: 'gulp tests-viewer-unit --max-old-space-size=8192'
@@ -222,4 +207,4 @@ jobs:
     condition: succeededOrFailed()
     inputs:
       testRunner: JUnit
-      testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'
+      testResultsFiles: '.temp/testResults/ViewerValidationTests.xml'