From e191556d3b8ca576e1b61dc3b1e7a71ec5d2f412 Mon Sep 17 00:00:00 2001 From: Anthony Dresser Date: Fri, 25 Oct 2019 13:04:41 -0700 Subject: [PATCH] Update pipelines (#7993) * update pipelines * update * fix scripts * testing something * testing something * testing something * add github token * testing something * delete fiels --- azure-pipelines-linux-mac.yml | 85 ------------------- azure-pipelines-windows.yml | 60 ------------- azure-pipelines.yml | 34 ++++---- .../darwin/continuous-build-darwin.yml | 32 ++++--- .../linux/continuous-build-linux.yml | 34 +++++--- .../win32/continuous-build-win32.yml | 31 ++++--- 6 files changed, 75 insertions(+), 201 deletions(-) delete mode 100644 azure-pipelines-linux-mac.yml delete mode 100644 azure-pipelines-windows.yml diff --git a/azure-pipelines-linux-mac.yml b/azure-pipelines-linux-mac.yml deleted file mode 100644 index 24e37525ca..0000000000 --- a/azure-pipelines-linux-mac.yml +++ /dev/null @@ -1,85 +0,0 @@ -steps: - - script: | - export CXX="g++-4.9" CC="gcc-4.9" DISPLAY=:10 - sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb - sudo chmod +x /etc/init.d/xvfb - sudo update-rc.d xvfb defaults - sudo service xvfb start - sudo apt-get install -y libkrb5-dev - # sh -e /etc/init.d/xvfb start - # sleep 3 - displayName: "Linux preinstall" - condition: eq(variables['Agent.OS'], 'Linux') - - - task: NodeTool@0 - inputs: - versionSpec: "10.15.1" - - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" - targetfolder: "**/node_modules, !**/node_modules/**/node_modules" - vstsFeed: "$(build-cache)" - - - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 - inputs: - versionSpec: "1.10.1" - - - script: | - yarn --frozen-lockfile - displayName: Install Dependencies - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - inputs: - keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" - targetfolder: "**/node_modules, !**/node_modules/**/node_modules" - vstsFeed: "$(build-cache)" - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - - - script: | - yarn electron x64 - displayName: Download Electron - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - - - script: | - yarn gulp hygiene --skip-tslint - displayName: Run Hygiene Checks - - - script: | - yarn tslint - displayName: Run TSLint - - - script: | - yarn strict-null-check - displayName: Run Strict Null Check - - - script: | - yarn compile - displayName: Compile - - - script: | - DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" - displayName: Run Unit Tests (Linux) - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) - - - script: | - DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" --coverage - displayName: Run Unit Tests (Mac) - condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux')) - - - task: PublishTestResults@2 - inputs: - testResultsFiles: '*-results.xml' - searchFolder: '$(Build.ArtifactStagingDirectory)/test-results' - condition: succeededOrFailed() - - - task: PublishCodeCoverageResults@1 - inputs: - codeCoverageTool: 'cobertura' - summaryFileLocation: $(System.DefaultWorkingDirectory)/.build/coverage/cobertura-coverage.xml - reportDirectory: $(System.DefaultWorkingDirectory)/.build/coverage/lcov-report - condition: ne(variables['Agent.OS'], 'Linux') diff --git a/azure-pipelines-windows.yml b/azure-pipelines-windows.yml deleted file mode 100644 index 7a3a0950e2..0000000000 --- a/azure-pipelines-windows.yml +++ /dev/null @@ -1,60 +0,0 @@ -steps: - - task: NodeTool@0 - inputs: - versionSpec: "10.15.1" - - - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" - targetfolder: "**/node_modules, !**/node_modules/**/node_modules" - vstsFeed: "$(build-cache)" - - - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 - inputs: - versionSpec: "1.10.1" - - - script: | - yarn --frozen-lockfile - displayName: Install Dependencies - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - - - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - inputs: - keyfile: ".yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock" - targetfolder: "**/node_modules, !**/node_modules/**/node_modules" - vstsFeed: "$(build-cache)" - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - - - script: | - yarn electron x64 - displayName: "Electron" - env: - GITHUB_TOKEN: $(GITHUB_TOKEN) - - - script: | - yarn gulp hygiene --skip-tslint - displayName: Run Hygiene Checks - - - script: | - yarn tslint - displayName: Run TSLint - - - script: | - yarn strict-null-check - displayName: Run Strict Null Check - - - script: | - yarn compile - displayName: Compile - - - powershell: | - .\scripts\test.bat --tfs "Unit Tests" - displayName: Run Unit Tests - - - task: PublishTestResults@2 - inputs: - testResultsFiles: "*-results.xml" - searchFolder: "$(Build.ArtifactStagingDirectory)/test-results" - condition: succeededOrFailed() diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 59ac192fd4..56360d11cd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,22 +1,18 @@ -trigger: - - master - - release/* - jobs: - - job: Windows - pool: - vmImage: VS2017-Win2016 - steps: - - template: azure-pipelines-windows.yml +- job: Windows + pool: + vmImage: VS2017-Win2016 + steps: + - template: build/azure-pipelines/win32/continuous-build-win32.yml - - job: Linux - pool: - vmImage: "Ubuntu-16.04" - steps: - - template: azure-pipelines-linux-mac.yml +- job: Linux + pool: + vmImage: 'Ubuntu-16.04' + steps: + - template: build/azure-pipelines/linux/continuous-build-linux.yml - - job: macOS - pool: - vmImage: macOS 10.13 - steps: - - template: azure-pipelines-linux-mac.yml +- job: macOS + pool: + vmImage: macOS 10.13 + steps: + - template: build/azure-pipelines/darwin/continuous-build-darwin.yml diff --git a/build/azure-pipelines/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml index 018b09c48c..c13acb2f2e 100644 --- a/build/azure-pipelines/darwin/continuous-build-darwin.yml +++ b/build/azure-pipelines/darwin/continuous-build-darwin.yml @@ -6,19 +6,21 @@ steps: inputs: keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: '$(ArtifactFeed)' -- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2 + vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache +- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version inputs: versionSpec: "1.x" - script: | CHILD_CONCURRENCY=1 yarn --frozen-lockfile displayName: Install Dependencies condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) + env: + GITHUB_TOKEN: $(GITHUB_TOKEN) # {{SQL CARBON EDIT}} add github token - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 inputs: keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: '$(ArtifactFeed)' + vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - script: | yarn electron x64 @@ -29,21 +31,27 @@ steps: - script: | yarn gulp tslint displayName: Run TSLint Checks -- script: | - yarn monaco-compile-check - displayName: Run Monaco Editor Checks +- script: | # {{SQL CARBON EDIT}} add step + yarn strict-null-check + displayName: Run Strict Null Check. +- script: | # {{SQL CARBON EDIT}} add step + yarn tslint + displayName: Run TSLint (gci) +# - script: | {{SQL CARBON EDIT}} remove step +# yarn monaco-compile-check +# displayName: Run Monaco Editor Checks - script: | yarn compile displayName: Compile Sources -- script: | - yarn download-builtin-extensions - displayName: Download Built-in Extensions +# - script: | {{SQL CARBON EDIT}} remove step +# yarn download-builtin-extensions +# displayName: Download Built-in Extensions - script: | ./scripts/test.sh --tfs "Unit Tests" displayName: Run Unit Tests -- script: | - ./scripts/test-integration.sh --tfs "Integration Tests" - displayName: Run Integration Tests +# - script: | {{SQL CARBON EDIT}} remove step +# ./scripts/test-integration.sh --tfs "Integration Tests" +# displayName: Run Integration Tests - task: PublishTestResults@2 displayName: Publish Tests Results inputs: diff --git a/build/azure-pipelines/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml index 7ca5db331a..d7a8961335 100644 --- a/build/azure-pipelines/linux/continuous-build-linux.yml +++ b/build/azure-pipelines/linux/continuous-build-linux.yml @@ -2,7 +2,7 @@ steps: - script: | set -e sudo apt-get update - sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 + sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 dbus xvfb libgtk-3-0 libkrb5-dev #{{SQL CARBON EDIT}} add kerberos dep sudo cp build/azure-pipelines/linux/xvfb.init /etc/init.d/xvfb sudo chmod +x /etc/init.d/xvfb sudo update-rc.d xvfb defaults @@ -14,19 +14,21 @@ steps: inputs: keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: '$(ArtifactFeed)' -- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2 + vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache +- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version inputs: versionSpec: "1.x" - script: | CHILD_CONCURRENCY=1 yarn --frozen-lockfile displayName: Install Dependencies condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) + env: + GITHUB_TOKEN: $(GITHUB_TOKEN) # {{SQL CARBON EDIT}} add github token - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 inputs: keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: '$(ArtifactFeed)' + vstsFeed: '$(ArtifactFeed)' # {{SQL CARBON EDIT}} update build cache condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - script: | yarn electron x64 @@ -37,21 +39,27 @@ steps: - script: | yarn gulp tslint displayName: Run TSLint Checks -- script: | - yarn monaco-compile-check - displayName: Run Monaco Editor Checks +- script: | # {{SQL CARBON EDIT}} add gci checks + yarn tslint + displayName: Run TSLint (gci) +- script: | # {{SQL CARBON EDIT}} add strict null check + yarn strict-null-check + displayName: Run Strict Null Check +# - script: | {{SQL CARBON EDIT}} remove monaco editor checks +# yarn monaco-compile-check +# displayName: Run Monaco Editor Checks - script: | yarn compile displayName: Compile Sources -- script: | - yarn download-builtin-extensions - displayName: Download Built-in Extensions +# - script: | {{SQL CARBON EDIT}} remove step +# yarn download-builtin-extensions +# displayName: Download Built-in Extensions - script: | DISPLAY=:10 ./scripts/test.sh --tfs "Unit Tests" displayName: Run Unit Tests -- script: | - DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" - displayName: Run Integration Tests +# - script: | {{SQL CARBON EDIT}} remove step +# DISPLAY=:10 ./scripts/test-integration.sh --tfs "Integration Tests" +# displayName: Run Integration Tests - task: PublishTestResults@2 displayName: Publish Tests Results inputs: diff --git a/build/azure-pipelines/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml index f0316915b2..1bff2154f0 100644 --- a/build/azure-pipelines/win32/continuous-build-win32.yml +++ b/build/azure-pipelines/win32/continuous-build-win32.yml @@ -2,7 +2,7 @@ steps: - task: NodeTool@0 inputs: versionSpec: "10.15.1" -- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2 +- task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 # {{SQL CARBON EDIT}} update version inputs: versionSpec: "1.x" - task: UsePythonVersion@0 @@ -13,18 +13,19 @@ steps: inputs: keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: '$(ArtifactFeed)' + vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache - powershell: | yarn --frozen-lockfile env: CHILD_CONCURRENCY: "1" + GITHUB_TOKEN: $(GITHUB_TOKEN) # {{SQL CARBON EDIT}} add github token displayName: Install Dependencies condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 inputs: keyfile: '.yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: '$(ArtifactFeed)' + vstsFeed: '$(build-cache)' # {{SQL CARBON EDIT}} update build cache condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) - powershell: | yarn electron @@ -34,21 +35,27 @@ steps: - script: | yarn gulp tslint displayName: Run TSLint Checks -- powershell: | - yarn monaco-compile-check - displayName: Run Monaco Editor Checks +- script: | # {{SQL CARBON EDIT}} add step + yarn tslint + displayName: Run TSLint (gci) +- script: | # {{SQL CARBON EDIT}} add step + yarn strict-null-check + displayName: Run Strict Null Check +# - powershell: | {{SQL CARBON EDIT}} remove step +# yarn monaco-compile-check +# displayName: Run Monaco Editor Checks - powershell: | yarn compile displayName: Compile Sources -- powershell: | - yarn download-builtin-extensions - displayName: Download Built-in Extensions +# - powershell: | {{SQL CARBON EDIT}} remove step +# yarn download-builtin-extensions +# displayName: Download Built-in Extensions - powershell: | .\scripts\test.bat --tfs "Unit Tests" displayName: Run Unit Tests -- powershell: | - .\scripts\test-integration.bat --tfs "Integration Tests" - displayName: Run Integration Tests +# - powershell: | {{SQL CARBON EDIT}} remove step +# .\scripts\test-integration.bat --tfs "Integration Tests" +# displayName: Run Integration Tests - task: PublishTestResults@2 displayName: Publish Tests Results inputs: