From b07bde89befdc27b1e8be5c6cbc8bfa1a379f895 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Sun, 1 Sep 2019 07:37:04 +0200 Subject: [PATCH] more tests --- .../darwin/product-build-darwin.yml | 228 +++++++++--------- build/azure-pipelines/product-build.yml | 4 +- 2 files changed, 117 insertions(+), 115 deletions(-) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 6d62c21a767..c7fe9299fef 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -5,19 +5,19 @@ steps: echo -n $VSCODE_QUALITY > .build/quality displayName: Prepare cache flag -- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: 'build/.cachesalt, .build/commit, .build/quality' - targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min' - vstsFeed: 'npm-vscode' - platformIndependent: true - alias: 'Compilation' +# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 +# inputs: +# keyfile: 'build/.cachesalt, .build/commit, .build/quality' +# targetfolder: '.build, out-build, out-vscode-min, out-vscode-reh-min, out-vscode-reh-web-min' +# vstsFeed: 'npm-vscode' +# platformIndependent: true +# alias: 'Compilation' -- script: | - set -e - exit 1 - displayName: Check RestoreCache - condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true')) +# - script: | +# set -e +# exit 1 +# displayName: Check RestoreCache +# condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true')) - task: NodeTool@0 inputs: @@ -33,126 +33,128 @@ steps: azureSubscription: 'vscode-builds-subscription' KeyVaultName: vscode -- script: | - set -e +# - script: | +# set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF +# cat << EOF > ~/.netrc +# machine github.com +# login vscode +# password $(github-distro-mixin-password) +# EOF - git config user.email "vscode@microsoft.com" - git config user.name "VSCode" - displayName: Prepare tooling +# git config user.email "vscode@microsoft.com" +# git config user.name "VSCode" +# displayName: Prepare tooling -- script: | - set -e - git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" - git fetch distro - git merge $(node -p "require('./package.json').distro") - displayName: Merge distro +# - script: | +# set -e +# git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" +# git fetch distro +# git merge $(node -p "require('./package.json').distro") +# displayName: Merge distro -- task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 - inputs: - keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'npm-vscode' +# - task: 1ESLighthouseEng.PipelineArtifactCaching.RestoreCacheV1.RestoreCache@1 +# inputs: +# keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' +# targetfolder: '**/node_modules, !**/node_modules/**/node_modules' +# vstsFeed: 'npm-vscode' -- script: | - set -e - CHILD_CONCURRENCY=1 yarn --frozen-lockfile - displayName: Install dependencies - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) +# - script: | +# set -e +# CHILD_CONCURRENCY=1 yarn --frozen-lockfile +# displayName: Install dependencies +# condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) -- task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 - inputs: - keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' - targetfolder: '**/node_modules, !**/node_modules/**/node_modules' - vstsFeed: 'npm-vscode' - condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) +# - task: 1ESLighthouseEng.PipelineArtifactCaching.SaveCacheV1.SaveCache@1 +# inputs: +# keyfile: 'build/.cachesalt, .yarnrc, remote/.yarnrc, **/yarn.lock, !**/node_modules/**/yarn.lock, !**/.*/**/yarn.lock' +# targetfolder: '**/node_modules, !**/node_modules/**/node_modules' +# vstsFeed: 'npm-vscode' +# condition: and(succeeded(), ne(variables['CacheRestored'], 'true')) -- script: | - set -e - yarn postinstall - displayName: Run postinstall scripts - condition: and(succeeded(), eq(variables['CacheRestored'], 'true')) +# - script: | +# set -e +# yarn postinstall +# displayName: Run postinstall scripts +# condition: and(succeeded(), eq(variables['CacheRestored'], 'true')) -- script: | - set -e - node build/azure-pipelines/mixin - displayName: Mix in quality +# - script: | +# set -e +# node build/azure-pipelines/mixin +# displayName: Mix in quality -- script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-darwin-min-ci - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-darwin-min-ci - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-web-darwin-min-ci - displayName: Build +# - script: | +# set -e +# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ +# yarn gulp vscode-darwin-min-ci +# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ +# yarn gulp vscode-reh-darwin-min-ci +# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ +# yarn gulp vscode-reh-web-darwin-min-ci +# displayName: Build -- script: | - set -e - ./scripts/test.sh --build --tfs "Unit Tests" - # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`" - # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME" - displayName: Run unit tests - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) +# - script: | +# set -e +# ./scripts/test.sh --build --tfs "Unit Tests" +# # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`" +# # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME" +# displayName: Run unit tests +# condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) - script: | set -e APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`" + echo $APP_NAME APP_ELECTRON="$(agent.builddirectory)/VSCode-darwin/$APP_NAME/Contents/MacOS/Electron" - ./scripts/test-integration.sh --build --tfs "Integration Tests" + echo $APP_ELECTRON + # ./scripts/test-integration.sh --build --tfs "Integration Tests" displayName: Run integration tests condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) -- script: | - set -e - cd test/smoke - yarn compile - cd - - yarn smoketest --web --headless - continueOnError: true - displayName: Run web smoke tests - condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) +# - script: | +# set -e +# cd test/smoke +# yarn compile +# cd - +# yarn smoketest --web --headless +# continueOnError: true +# displayName: Run web smoke tests +# condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) -- script: | - set -e - pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd - displayName: Archive build +# - script: | +# set -e +# pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd +# displayName: Archive build -- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 - inputs: - ConnectedServiceName: 'ESRP CodeSign' - FolderPath: '$(agent.builddirectory)' - Pattern: 'VSCode-darwin.zip' - signConfigType: inlineSignParams - inlineOperation: | - [ - { - "keyCode": "CP-401337-Apple", - "operationSetCode": "MacAppDeveloperSign", - "parameters": [ ], - "toolName": "sign", - "toolVersion": "1.0" - } - ] - SessionTimeout: 120 - displayName: Codesign +# - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1 +# inputs: +# ConnectedServiceName: 'ESRP CodeSign' +# FolderPath: '$(agent.builddirectory)' +# Pattern: 'VSCode-darwin.zip' +# signConfigType: inlineSignParams +# inlineOperation: | +# [ +# { +# "keyCode": "CP-401337-Apple", +# "operationSetCode": "MacAppDeveloperSign", +# "parameters": [ ], +# "toolName": "sign", +# "toolVersion": "1.0" +# } +# ] +# SessionTimeout: 120 +# displayName: Codesign -- script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ - AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \ - AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ - VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ - ./build/azure-pipelines/darwin/publish.sh - displayName: Publish +# - script: | +# set -e +# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ +# AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ +# AZURE_STORAGE_ACCESS_KEY="$(ticino-storage-key)" \ +# AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ +# VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ +# ./build/azure-pipelines/darwin/publish.sh +# displayName: Publish -- task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - continueOnError: true +# - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 +# displayName: 'Component Detection' +# continueOnError: true diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index ecf47fa1cdd..ab08c16f0a5 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -103,8 +103,8 @@ jobs: condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true')) pool: vmImage: macOS 10.13 - dependsOn: - - Compile + # dependsOn: + # - Compile steps: - template: darwin/product-build-darwin.yml