diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml index 9187dcc23b1220346faa78b25d59b71cb5d75622..4b747443cc114e2f97ac3f12bdc9f0bd42c64c73 100644 --- a/build/azure-pipelines/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -146,15 +146,15 @@ steps: 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' diff --git a/build/azure-pipelines/linux/product-build-linux-alpine.yml b/build/azure-pipelines/linux/product-build-linux-alpine.yml index 1354118a93c4b2da71a8671854e3a886c701e755..d3da7c4d952c450d9026ba246ee3306759a9a6ad 100644 --- a/build/azure-pipelines/linux/product-build-linux-alpine.yml +++ b/build/azure-pipelines/linux/product-build-linux-alpine.yml @@ -93,14 +93,14 @@ steps: ./build/azure-pipelines/linux/build-alpine.sh displayName: Build -# - script: | -# set -e -# AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ -# AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ -# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ -# VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ -# ./build/azure-pipelines/linux/publish-alpine.sh -# displayName: Publish +- script: | + set -e + AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ + AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ + ./build/azure-pipelines/linux/publish-alpine.sh + displayName: Publish - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Detection' diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-arm.yml index 62ed46e6a60bfb5f10bfa8fc916abd8a4a7922f3..708fd1bf66f8bfef3643179a43142fd0b0f35977 100644 --- a/build/azure-pipelines/linux/product-build-linux-arm.yml +++ b/build/azure-pipelines/linux/product-build-linux-arm.yml @@ -93,14 +93,14 @@ steps: ./build/azure-pipelines/linux/build-arm.sh displayName: Build -# - script: | -# set -e -# AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ -# AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ -# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ -# VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ -# ./build/azure-pipelines/linux/publish-arm.sh -# displayName: Publish +- script: | + set -e + AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ + AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ + ./build/azure-pipelines/linux/publish-arm.sh + displayName: Publish - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Detection' diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml index 972e46f828345257c1722b76178d287841dcb5ac..f6887313aef4e41da6ee4ae89ed2493f8cea89f0 100644 --- a/build/azure-pipelines/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -119,21 +119,21 @@ steps: displayName: Run unit tests condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false')) -# - script: | -# set -e -# AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ -# AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ -# VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ -# VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ -# ./build/azure-pipelines/linux/publish.sh -# displayName: Publish +- script: | + set -e + AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ + AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ + VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \ + VSCODE_HOCKEYAPP_TOKEN="$(vscode-hockeyapp-token)" \ + ./build/azure-pipelines/linux/publish.sh + displayName: Publish - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Detection' continueOnError: true -# - task: PublishPipelineArtifact@0 -# displayName: 'Publish Pipeline Artifact' -# inputs: -# artifactName: snap-$(VSCODE_ARCH) -# targetPath: .build/linux/snap-tarball +- task: PublishPipelineArtifact@0 + displayName: 'Publish Pipeline Artifact' + inputs: + artifactName: snap-$(VSCODE_ARCH) + targetPath: .build/linux/snap-tarball diff --git a/build/azure-pipelines/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml index 83bcdfe36e57b6326ac2b4c10dd1388c38bc793d..9dbe920b87bb1c3ab0f0e0bd0b3ff43ecd2a212c 100644 --- a/build/azure-pipelines/linux/snap-build-linux.yml +++ b/build/azure-pipelines/linux/snap-build-linux.yml @@ -50,6 +50,6 @@ steps: (cd $SNAP_ROOT/code-* && sudo --preserve-env snapcraft snap --output "$SNAP_PATH") # Publish snap package - # AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ - # AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ - # node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "linux-snap-$ARCH" package "$SNAP_FILENAME" "$VERSION" true "$SNAP_PATH" \ No newline at end of file + AZURE_DOCUMENTDB_MASTERKEY="$(builds-docdb-key-readwrite)" \ + AZURE_STORAGE_ACCESS_KEY_2="$(vscode-storage-key)" \ + node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "linux-snap-$ARCH" package "$SNAP_FILENAME" "$VERSION" true "$SNAP_PATH" \ No newline at end of file diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml index 565bd1c1f14f16e826c987b2d502888d4f8d5482..0353a0354d56c118590243f2637d6f965411d32b 100644 --- a/build/azure-pipelines/product-build.yml +++ b/build/azure-pipelines/product-build.yml @@ -44,17 +44,17 @@ jobs: steps: - template: linux/product-build-linux.yml -# - job: LinuxSnap -# condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true')) -# timeoutInMinutes: 120 -# pool: -# vmImage: 'Ubuntu-16.04' -# variables: -# VSCODE_ARCH: x64 -# container: snapcraft -# dependsOn: Linux -# steps: -# - template: linux/snap-build-linux.yml +- job: LinuxSnap + condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true')) + timeoutInMinutes: 120 + pool: + vmImage: 'Ubuntu-16.04' + variables: + VSCODE_ARCH: x64 + container: snapcraft + dependsOn: Linux + steps: + - template: linux/snap-build-linux.yml - job: LinuxArmhf condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX_ARMHF'], 'true'), ne(variables['VSCODE_QUALITY'], 'stable')) @@ -92,7 +92,7 @@ jobs: - Windows - Windows32 - Linux - # - LinuxSnap + - LinuxSnap - LinuxArmhf - LinuxAlpine - macOS @@ -107,7 +107,7 @@ jobs: - Windows - Windows32 - Linux - # - LinuxSnap + - LinuxSnap - LinuxArmhf - LinuxAlpine - macOS diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml index f47016c76ff36e59971708a5c90d3c875195f09b..799599251a89c94fc4cbb23115bff6e8454bba03 100644 --- a/build/azure-pipelines/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -207,15 +207,15 @@ steps: .\build\azure-pipelines\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(esrp-auth-certificate) -AuthCertificateKey $(esrp-auth-certificate-key) displayName: Import ESRP Auth Certificate -# - powershell: | -# . build/azure-pipelines/win32/exec.ps1 -# $ErrorActionPreference = "Stop" -# $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)" -# $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)" -# $env:VSCODE_HOCKEYAPP_TOKEN = "$(vscode-hockeyapp-token)" -# $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" -# .\build\azure-pipelines\win32\publish.ps1 -# displayName: Publish +- powershell: | + . build/azure-pipelines/win32/exec.ps1 + $ErrorActionPreference = "Stop" + $env:AZURE_STORAGE_ACCESS_KEY_2 = "$(vscode-storage-key)" + $env:AZURE_DOCUMENTDB_MASTERKEY = "$(builds-docdb-key-readwrite)" + $env:VSCODE_HOCKEYAPP_TOKEN = "$(vscode-hockeyapp-token)" + $env:VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" + .\build\azure-pipelines\win32\publish.ps1 + displayName: Publish - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Detection'