Merge pull request #84 from Promact/ImproveBuildTimeUsingYarn

Improve build issue
Promact · Dec 23, 2016 · 985b54a · 985b54a
2 parents ead44aa + fc263fd
commit 985b54a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Slack.Automation/Promact.Erp.Web/karma.config.js b/Slack.Automation/Promact.Erp.Web/karma.config.js
@@ -22,7 +22,7 @@ module.exports = function (config) {
                   'node_modules/systemjs/dist/system.src.js',
 
                   // Zone.js dependencies
-                    
+
                     'node_modules/zone.js/dist/zone.js',
                     'node_modules/zone.js/dist/proxy.js',
                     'node_modules/zone.js/dist/sync-test.js',
@@ -58,18 +58,18 @@ module.exports = function (config) {
 
         // preprocess matching files before serving them to the browser
         // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
-        //preprocessors: {
-        //    "**/app/*spec.js": "coverage"
-        //},
+        preprocessors: {
+            "**/app/*spec.js": "coverage"
+        },
 
         // test results reporter to use
         // possible values: 'dots', 'progress'
         // available reporters: https://npmjs.org/browse/keyword/karma-reporter
         reporters: ['progress', 'coverage', 'coveralls'],
 
         coverageReporter: {
-            type: 'lcov', // lcov or lcovonly are required for generating lcov.info files
-            dir: 'coverage/'
+            reporters: [
+                { type: 'lcov', subdir: '.', file: 'lcov.info' }]
         },
 
         // proxied base paths

diff --git a/Slack.Automation/Promact.Erp.Web/package.json b/Slack.Automation/Promact.Erp.Web/package.json
@@ -57,14 +57,14 @@
     "karma-htmlfile-reporter": "0.3.4",
     "karma-jasmine": "1.0.2",
     "lite-server": "2.2.2",
-    "lodash": "4.16.4",
+    "lodash": "4.16.6",
     "protractor": "4.0.10",
     "remap-istanbul": "0.7.0",
     "rimraf": "2.5.4",
     "systemjs": "0.19.40",
     "tslint": "3.15.1",
-    "typescript": "2.0.6",
-    "typings": "1.4.0"
+    "typescript": "2.0.8",
+    "typings": "2.0.0"
   },
   "repository": {}
-}
+}
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,8 +7,10 @@ environment:
  nodejs_version: "0.12"
  COVERALLS_REPO_TOKEN:
    secure: IzBCZbWnAF8/KBbmUT7D7L8kzbEkFsvEeKPY2I0C537SeYlruZUCDR19I2kSdb5A
+cache:
+- "%LOCALAPPDATA%\\Yarn"
 build_script:
-- cmd: "nuget restore \".\\Slack.Automation\\Promact.ERP.sln\"\nnpm install -g typings \ncd \".\\Slack.Automation\\Promact.Erp.Web\"\nnpm install\ncd \"..\\..\"\nmsbuild \".\\Slack.Automation\\Promact.ERP.sln\" /m /verbosity:minimal /logger:\"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll\" /p:Optimize=False"
+- cmd: "nuget restore \".\\Slack.Automation\\Promact.ERP.sln\"\nnpm i -g yarn && yarn global add typescript typings\ncd \".\\Slack.Automation\\Promact.Erp.Web\"\nyarn\ncd \"..\\..\"\nmsbuild \".\\Slack.Automation\\Promact.ERP.sln\" /m /verbosity:minimal /logger:\"C:\\Program Files\\AppVeyor\\BuildAgent\\Appveyor.MSBuildLogger.dll\" /p:Optimize=False"
 build:
  project: .\Slack.Automation\Promact.ERP.sln
  parallel: true
@@ -26,5 +28,5 @@ test_script:
    & $coveralls --opencover -i opencoverCoverage.xml --repoToken $env:COVERALLS_REPO_TOKEN --commitId $env:APPVEYOR_REPO_COMMIT --commitBranch $env:APPVEYOR_REPO_BRANCH --commitAuthor $env:APPVEYOR_REPO_COMMIT_AUTHOR --commitEmail $env:APPVEYOR_REPO_COMMIT_AUTHOR_EMAIL --commitMessage $env:APPVEYOR_REPO_COMMIT_MESSAGE --jobId $env:APPVEYOR_JOB_ID
    }
 - cd ./Slack.Automation/Promact.Erp.Web
-- npm test
+- npm test