From 6f00a3acef9b74feed53356d176db1246a0f4c35 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Wed, 11 Jan 2023 15:03:53 +0100 Subject: [PATCH] debug --- .../darwin/product-build-darwin.yml | 474 +++++++++--------- build/azure-pipelines/product-build.yml | 8 +- 2 files changed, 241 insertions(+), 241 deletions(-) diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index cf005a97a2a..db23834348b 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -30,201 +30,201 @@ steps: KeyVaultName: vscode-build-secrets SecretsFilter: "github-distro-mixin-password,macos-developer-certificate,macos-developer-certificate-key" - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - task: DownloadPipelineArtifact@2 - inputs: - artifact: Compilation - path: $(Build.ArtifactStagingDirectory) - displayName: Download compilation output + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - task: DownloadPipelineArtifact@2 + # inputs: + # artifact: Compilation + # path: $(Build.ArtifactStagingDirectory) + # displayName: Download compilation output - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz - displayName: Extract compilation output + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # tar -xzf $(Build.ArtifactStagingDirectory)/compilation.tar.gz + # displayName: Extract compilation output - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - cat << EOF > ~/.netrc - machine github.com - login vscode - password $(github-distro-mixin-password) - EOF + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # 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 - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF - echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" - git checkout FETCH_HEAD - condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) - displayName: Checkout override commit + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # git fetch https://github.com/$(VSCODE_MIXIN_REPO).git $VSCODE_DISTRO_REF + # echo "##vso[task.setvariable variable=VSCODE_DISTRO_COMMIT;]$(git rev-parse FETCH_HEAD)" + # git checkout FETCH_HEAD + # condition: and(succeeded(), ne(variables.VSCODE_DISTRO_REF, ' ')) + # displayName: Checkout override commit - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") - displayName: Merge distro + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro") + # displayName: Merge distro - - script: node build/setup-npm-registry.js $NPM_REGISTRY - condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) - displayName: Setup NPM Registry + # - script: node build/setup-npm-registry.js $NPM_REGISTRY + # condition: and(succeeded(), ne(variables['NPM_REGISTRY'], 'none')) + # displayName: Setup NPM Registry - - script: | - mkdir -p .build - node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH > .build/yarnlockhash - node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash - displayName: Prepare yarn cache flags + # - script: | + # mkdir -p .build + # node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH > .build/yarnlockhash + # node build/azure-pipelines/common/computeBuiltInDepsCacheKey.js > .build/builtindepshash + # displayName: Prepare yarn cache flags - - task: Cache@2 - inputs: - key: "nodeModules | $(Agent.OS) | .build/yarnlockhash" - path: .build/node_modules_cache - cacheHitVar: NODE_MODULES_RESTORED - displayName: Restore node_modules cache + # - task: Cache@2 + # inputs: + # key: "nodeModules | $(Agent.OS) | .build/yarnlockhash" + # path: .build/node_modules_cache + # cacheHitVar: NODE_MODULES_RESTORED + # displayName: Restore node_modules cache - - task: Cache@2 - inputs: - key: '"builtInDeps" | .build/builtindepshash' - path: .build/builtInExtensions - displayName: Restore built-in extensions + # - task: Cache@2 + # inputs: + # key: '"builtInDeps" | .build/builtindepshash' + # path: .build/builtInExtensions + # displayName: Restore built-in extensions - - script: | - set -e - tar -xzf .build/node_modules_cache/cache.tgz - condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) - displayName: Extract node_modules cache + # - script: | + # set -e + # tar -xzf .build/node_modules_cache/cache.tgz + # condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true')) + # displayName: Extract node_modules cache - - script: | - set -e - npm config set registry "$NPM_REGISTRY" --location=project - npm config set always-auth=true --location=project - yarn config set registry "$NPM_REGISTRY" - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) - displayName: Setup NPM & Yarn + # - script: | + # set -e + # npm config set registry "$NPM_REGISTRY" --location=project + # npm config set always-auth=true --location=project + # yarn config set registry "$NPM_REGISTRY" + # condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + # displayName: Setup NPM & Yarn - - task: npmAuthenticate@0 - inputs: - workingFile: .npmrc - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) - displayName: Setup NPM Authentication + # - task: npmAuthenticate@0 + # inputs: + # workingFile: .npmrc + # condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), ne(variables['NPM_REGISTRY'], 'none')) + # displayName: Setup NPM Authentication - - script: | - set -e - export npm_config_arch=$(VSCODE_ARCH) - export npm_config_node_gyp=$(which node-gyp) + # - script: | + # set -e + # export npm_config_arch=$(VSCODE_ARCH) + # export npm_config_node_gyp=$(which node-gyp) - for i in {1..3}; do # try 3 times - yarn --frozen-lockfile --check-files && break - if [ $i -eq 3 ]; then - echo "Yarn failed too many times" >&2 - exit 1 - fi - echo "Yarn failed $i, trying again..." - done - env: - ELECTRON_SKIP_BINARY_DOWNLOAD: 1 - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 - GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Install dependencies - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + # for i in {1..3}; do # try 3 times + # yarn --frozen-lockfile --check-files && break + # if [ $i -eq 3 ]; then + # echo "Yarn failed too many times" >&2 + # exit 1 + # fi + # echo "Yarn failed $i, trying again..." + # done + # env: + # ELECTRON_SKIP_BINARY_DOWNLOAD: 1 + # PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1 + # GITHUB_TOKEN: "$(github-distro-mixin-password)" + # displayName: Install dependencies + # condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - - script: | - set -e - node build/lib/builtInExtensions.js - env: - GITHUB_TOKEN: "$(github-distro-mixin-password)" - displayName: Download missing built-in extensions + # - script: | + # set -e + # node build/lib/builtInExtensions.js + # env: + # GITHUB_TOKEN: "$(github-distro-mixin-password)" + # displayName: Download missing built-in extensions - - script: | - set -e - node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt - mkdir -p .build/node_modules_cache - tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt - condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) - displayName: Create node_modules archive + # - script: | + # set -e + # node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt + # mkdir -p .build/node_modules_cache + # tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt + # condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true')) + # displayName: Create node_modules archive - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration) - - script: | - set -e - node build/azure-pipelines/mixin - displayName: Mix in quality + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # # This script brings in the right resources (images, icons, etc) based on the quality (insiders, stable, exploration) + # - script: | + # set -e + # node build/azure-pipelines/mixin + # displayName: Mix in quality - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci - displayName: Build client + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + # yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci + # displayName: Build client - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - node build/azure-pipelines/mixin --server - displayName: Mix in server quality + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # node build/azure-pipelines/mixin --server + # displayName: Mix in server quality - - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci - displayName: Build Server + # - ${{ if ne(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + # yarn gulp vscode-reh-darwin-$(VSCODE_ARCH)-min-ci + # VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + # yarn gulp vscode-reh-web-darwin-$(VSCODE_ARCH)-min-ci + # displayName: Build Server - - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: - - script: | - set -e - VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ - yarn gulp "transpile-client-swc" "transpile-extensions" - displayName: Transpile + # - ${{ if eq(parameters.VSCODE_QUALITY, 'oss') }}: + # - script: | + # set -e + # VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + # yarn gulp "transpile-client-swc" "transpile-extensions" + # displayName: Transpile - - script: | - set -e - APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" - APP_NAME="`ls $APP_ROOT | head -n 1`" - echo "##vso[task.setvariable variable=APP_PATH]$APP_ROOT/$APP_NAME" - displayName: Find application path + # - script: | + # set -e + # APP_ROOT="$(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH)" + # APP_NAME="`ls $APP_ROOT | head -n 1`" + # echo "##vso[task.setvariable variable=APP_PATH]$APP_ROOT/$APP_NAME" + # displayName: Find application path - - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: - - task: DownloadPipelineArtifact@2 - inputs: - artifact: unsigned_vscode_cli_darwin_arm64_cli - patterns: "**" - path: $(Build.ArtifactStagingDirectory)/cli - displayName: Download VS Code CLI - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) + # - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + # - task: DownloadPipelineArtifact@2 + # inputs: + # artifact: unsigned_vscode_cli_darwin_arm64_cli + # patterns: "**" + # path: $(Build.ArtifactStagingDirectory)/cli + # displayName: Download VS Code CLI + # condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'arm64')) - - task: DownloadPipelineArtifact@2 - inputs: - artifact: unsigned_vscode_cli_darwin_x64_cli - patterns: "**" - path: $(Build.ArtifactStagingDirectory)/cli - displayName: Download VS Code CLI - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + # - task: DownloadPipelineArtifact@2 + # inputs: + # artifact: unsigned_vscode_cli_darwin_x64_cli + # patterns: "**" + # path: $(Build.ArtifactStagingDirectory)/cli + # displayName: Download VS Code CLI + # condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - - script: | - set -e - ARCHIVE_NAME=$(ls "$(Build.ArtifactStagingDirectory)/cli" | head -n 1) - unzip "$(Build.ArtifactStagingDirectory)/cli/$ARCHIVE_NAME" -d "$(Build.ArtifactStagingDirectory)/cli" - CLI_APP_NAME=$(node -p "require(\"$(APP_PATH)/Contents/Resources/app/product.json\").tunnelApplicationName") - mv "$(Build.ArtifactStagingDirectory)/cli/code" "$(APP_PATH)/Contents/Resources/app/bin/$CLI_APP_NAME" - chmod +x "$(APP_PATH)/Contents/Resources/app/bin/$CLI_APP_NAME" - displayName: Make CLI executable + # - script: | + # set -e + # ARCHIVE_NAME=$(ls "$(Build.ArtifactStagingDirectory)/cli" | head -n 1) + # unzip "$(Build.ArtifactStagingDirectory)/cli/$ARCHIVE_NAME" -d "$(Build.ArtifactStagingDirectory)/cli" + # CLI_APP_NAME=$(node -p "require(\"$(APP_PATH)/Contents/Resources/app/product.json\").tunnelApplicationName") + # mv "$(Build.ArtifactStagingDirectory)/cli/code" "$(APP_PATH)/Contents/Resources/app/bin/$CLI_APP_NAME" + # chmod +x "$(APP_PATH)/Contents/Resources/app/bin/$CLI_APP_NAME" + # displayName: Make CLI executable - - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: - - template: product-build-darwin-test.yml - parameters: - VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} - VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} - VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} - VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} + # - ${{ if or(eq(parameters.VSCODE_RUN_UNIT_TESTS, true), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, true), eq(parameters.VSCODE_RUN_SMOKE_TESTS, true)) }}: + # - template: product-build-darwin-test.yml + # parameters: + # VSCODE_QUALITY: ${{ parameters.VSCODE_QUALITY }} + # VSCODE_RUN_UNIT_TESTS: ${{ parameters.VSCODE_RUN_UNIT_TESTS }} + # VSCODE_RUN_INTEGRATION_TESTS: ${{ parameters.VSCODE_RUN_INTEGRATION_TESTS }} + # VSCODE_RUN_SMOKE_TESTS: ${{ parameters.VSCODE_RUN_SMOKE_TESTS }} - ${{ if eq(parameters.VSCODE_PUBLISH, true) }}: # Setting hardened entitlements is a requirement for: @@ -242,83 +242,83 @@ steps: VSCODE_ARCH=$(VSCODE_ARCH) DEBUG=electron-osx-sign* node build/darwin/sign.js displayName: Set Hardened Entitlements - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - script: | - set -e - pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd - displayName: Archive build + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - script: | + # set -e + # pushd $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) && zip -r -X -y $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH).zip * && popd + # displayName: Archive build - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - script: | - set -e + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - script: | + # set -e - # package Remote Extension Host - pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd + # # package Remote Extension Host + # pushd .. && mv vscode-reh-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH) && zip -Xry vscode-server-darwin-$(VSCODE_ARCH).zip vscode-server-darwin-$(VSCODE_ARCH) && popd - # package Remote Extension Host (Web) - pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd - displayName: Prepare to publish servers + # # package Remote Extension Host (Web) + # pushd .. && mv vscode-reh-web-darwin-$(VSCODE_ARCH) vscode-server-darwin-$(VSCODE_ARCH)-web && zip -Xry vscode-server-darwin-$(VSCODE_ARCH)-web.zip vscode-server-darwin-$(VSCODE_ARCH)-web && popd + # displayName: Prepare to publish servers - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (client) - inputs: - BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) - PackageName: Visual Studio Code + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + # displayName: Generate SBOM (client) + # inputs: + # BuildDropPath: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH) + # PackageName: Visual Studio Code - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (client) - artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - publish: $(agent.builddirectory)/VSCode-darwin-$(VSCODE_ARCH)/_manifest + # displayName: Publish SBOM (client) + # artifact: vscode_client_darwin_$(VSCODE_ARCH)_sbom - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: Generate SBOM (server) - inputs: - BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) - PackageName: Visual Studio Code Server + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + # displayName: Generate SBOM (server) + # inputs: + # BuildDropPath: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH) + # PackageName: Visual Studio Code Server - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest - displayName: Publish SBOM (server) - artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - publish: $(agent.builddirectory)/vscode-server-darwin-$(VSCODE_ARCH)/_manifest + # displayName: Publish SBOM (server) + # artifact: vscode_server_darwin_$(VSCODE_ARCH)_sbom - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip - artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive - displayName: Publish client archive + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - publish: $(Agent.BuildDirectory)/VSCode-darwin-$(VSCODE_ARCH).zip + # artifact: unsigned_vscode_client_darwin_$(VSCODE_ARCH)_archive + # displayName: Publish client archive - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip - artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish server archive + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH).zip + # artifact: vscode_server_darwin_$(VSCODE_ARCH)_archive-unsigned + # displayName: Publish server archive - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip - artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned - displayName: Publish web server archive + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - publish: $(Agent.BuildDirectory)/vscode-server-darwin-$(VSCODE_ARCH)-web.zip + # artifact: vscode_web_darwin_$(VSCODE_ARCH)_archive-unsigned + # displayName: Publish web server archive - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - task: AzureCLI@2 - inputs: - azureSubscription: "vscode-builds-subscription" - scriptType: pscore - scriptLocation: inlineScript - addSpnToEnvironment: true - inlineScript: | - Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" - Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - task: AzureCLI@2 + # inputs: + # azureSubscription: "vscode-builds-subscription" + # scriptType: pscore + # scriptLocation: inlineScript + # addSpnToEnvironment: true + # inlineScript: | + # Write-Host "##vso[task.setvariable variable=AZURE_TENANT_ID]$env:tenantId" + # Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_ID]$env:servicePrincipalId" + # Write-Host "##vso[task.setvariable variable=AZURE_CLIENT_SECRET;issecret=true]$env:servicePrincipalKey" - - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: - - script: | - set -e - AZURE_STORAGE_ACCOUNT="ticino" \ - AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ - AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ - AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ - VSCODE_ARCH="$(VSCODE_ARCH)" \ - node build/azure-pipelines/upload-configuration - displayName: Upload configuration (for Bing settings search) - condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) - continueOnError: true + # - ${{ if and(eq(parameters.VSCODE_PUBLISH, true), eq(parameters.VSCODE_RUN_UNIT_TESTS, false), eq(parameters.VSCODE_RUN_INTEGRATION_TESTS, false), eq(parameters.VSCODE_RUN_SMOKE_TESTS, false)) }}: + # - script: | + # set -e + # AZURE_STORAGE_ACCOUNT="ticino" \ + # AZURE_TENANT_ID="$(AZURE_TENANT_ID)" \ + # AZURE_CLIENT_ID="$(AZURE_CLIENT_ID)" \ + # AZURE_CLIENT_SECRET="$(AZURE_CLIENT_SECRET)" \ + # VSCODE_ARCH="$(VSCODE_ARCH)" \ + # node build/azure-pipelines/upload-configuration + # displayName: Upload configuration (for Bing settings search) + # condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'x64')) + # continueOnError: true diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 6c561a4fb12..368c3ae1cb2 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -564,10 +564,10 @@ stages: - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_MACOS'], true)) }}: - stage: macOS - dependsOn: - - Compile - - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: - - CompileCLI + # dependsOn: + # - Compile + # - ${{ if eq(parameters.VSCODE_BUILD_TUNNEL_CLI, true) }}: + # - CompileCLI pool: vmImage: macOS-11 variables: