From 420edabab8debd8a092ae5d63a23d759412ea7b8 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 19 Nov 2018 10:46:19 +0100 Subject: [PATCH] rename tfs to azure-pipelines --- azure-pipelines.yml | 18 ++++++++++++++ .../common/.gitignore | 0 .../common/installDistro.ts | 0 .../common/publish.ts | 0 .../common/symbols.ts | 0 .../darwin/continuous-build-darwin.yml | 0 .../darwin/product-build-darwin.yml | 6 ++--- .../{tfs => azure-pipelines}/linux/.gitignore | 0 .../linux/continuous-build-linux.yml | 2 +- .../linux/frozen-check.js | 0 .../linux/product-build-linux.yml | 10 ++++---- .../linux/snap-build-linux.yml | 2 +- .../{tfs => azure-pipelines}/linux/xvfb.init | 0 .../product-build.yml | 0 .../win32/ESRPClient/NuGet.config | 0 .../win32/ESRPClient/packages.config | 0 .../win32/continuous-build-win32.yml | 0 build/{tfs => azure-pipelines}/win32/exec.ps1 | 0 .../win32/import-esrp-auth-cert.ps1 | 0 .../win32/product-build-win32.yml | 24 +++++++++---------- build/{tfs => azure-pipelines}/win32/sign.ps1 | 0 build/gulpfile.hygiene.js | 4 ++-- build/gulpfile.vscode.win32.js | 2 +- build/tfs/continuous-build.yml | 18 -------------- 24 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 azure-pipelines.yml rename build/{tfs => azure-pipelines}/common/.gitignore (100%) rename build/{tfs => azure-pipelines}/common/installDistro.ts (100%) rename build/{tfs => azure-pipelines}/common/publish.ts (100%) rename build/{tfs => azure-pipelines}/common/symbols.ts (100%) rename build/{tfs => azure-pipelines}/darwin/continuous-build-darwin.yml (100%) rename build/{tfs => azure-pipelines}/darwin/product-build-darwin.yml (90%) rename build/{tfs => azure-pipelines}/linux/.gitignore (100%) rename build/{tfs => azure-pipelines}/linux/continuous-build-linux.yml (94%) rename build/{tfs => azure-pipelines}/linux/frozen-check.js (100%) rename build/{tfs => azure-pipelines}/linux/product-build-linux.yml (85%) rename build/{tfs => azure-pipelines}/linux/snap-build-linux.yml (90%) rename build/{tfs => azure-pipelines}/linux/xvfb.init (100%) rename build/{tfs => azure-pipelines}/product-build.yml (100%) rename build/{tfs => azure-pipelines}/win32/ESRPClient/NuGet.config (100%) rename build/{tfs => azure-pipelines}/win32/ESRPClient/packages.config (100%) rename build/{tfs => azure-pipelines}/win32/continuous-build-win32.yml (100%) rename build/{tfs => azure-pipelines}/win32/exec.ps1 (100%) rename build/{tfs => azure-pipelines}/win32/import-esrp-auth-cert.ps1 (100%) rename build/{tfs => azure-pipelines}/win32/product-build-win32.yml (79%) rename build/{tfs => azure-pipelines}/win32/sign.ps1 (100%) delete mode 100644 build/tfs/continuous-build.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 00000000000..e52afca6028 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,18 @@ +jobs: +- 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: build/azure-pipelines/linux/continuous-build-linux.yml + +- job: macOS + pool: + vmImage: macOS 10.13 + steps: + - template: build/azure-pipelines/darwin/continuous-build-darwin.yml \ No newline at end of file diff --git a/build/tfs/common/.gitignore b/build/azure-pipelines/common/.gitignore similarity index 100% rename from build/tfs/common/.gitignore rename to build/azure-pipelines/common/.gitignore diff --git a/build/tfs/common/installDistro.ts b/build/azure-pipelines/common/installDistro.ts similarity index 100% rename from build/tfs/common/installDistro.ts rename to build/azure-pipelines/common/installDistro.ts diff --git a/build/tfs/common/publish.ts b/build/azure-pipelines/common/publish.ts similarity index 100% rename from build/tfs/common/publish.ts rename to build/azure-pipelines/common/publish.ts diff --git a/build/tfs/common/symbols.ts b/build/azure-pipelines/common/symbols.ts similarity index 100% rename from build/tfs/common/symbols.ts rename to build/azure-pipelines/common/symbols.ts diff --git a/build/tfs/darwin/continuous-build-darwin.yml b/build/azure-pipelines/darwin/continuous-build-darwin.yml similarity index 100% rename from build/tfs/darwin/continuous-build-darwin.yml rename to build/azure-pipelines/darwin/continuous-build-darwin.yml diff --git a/build/tfs/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml similarity index 90% rename from build/tfs/darwin/product-build-darwin.yml rename to build/azure-pipelines/darwin/product-build-darwin.yml index e5fa44ac50d..c510636efc9 100644 --- a/build/tfs/darwin/product-build-darwin.yml +++ b/build/azure-pipelines/darwin/product-build-darwin.yml @@ -15,7 +15,7 @@ steps: yarn monaco-compile-check yarn strict-null-check VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" yarn gulp -- mixin - node build/tfs/common/installDistro.js + node build/azure-pipelines/common/installDistro.js node build/lib/builtInExtensions.js displayName: Prepare build @@ -69,7 +69,7 @@ steps: AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \ AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \ MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \ - node build/tfs/common/publish.js \ + node build/azure-pipelines/common/publish.js \ "$(VSCODE_QUALITY)" \ darwin \ archive \ @@ -79,7 +79,7 @@ steps: ../VSCode-darwin.zip # publish hockeyapp symbols - node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)" + node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_MACOS)" # upload configuration AZURE_STORAGE_ACCESS_KEY="$(AZURE_STORAGE_ACCESS_KEY)" \ diff --git a/build/tfs/linux/.gitignore b/build/azure-pipelines/linux/.gitignore similarity index 100% rename from build/tfs/linux/.gitignore rename to build/azure-pipelines/linux/.gitignore diff --git a/build/tfs/linux/continuous-build-linux.yml b/build/azure-pipelines/linux/continuous-build-linux.yml similarity index 94% rename from build/tfs/linux/continuous-build-linux.yml rename to build/azure-pipelines/linux/continuous-build-linux.yml index ecc30963ec6..91891e6da94 100644 --- a/build/tfs/linux/continuous-build-linux.yml +++ b/build/azure-pipelines/linux/continuous-build-linux.yml @@ -3,7 +3,7 @@ steps: set -e sudo apt-get update sudo apt-get install -y libxkbfile-dev pkg-config libsecret-1-dev libxss1 libgconf-2-4 dbus xvfb libgtk-3-0 - sudo cp build/tfs/linux/xvfb.init /etc/init.d/xvfb + 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 diff --git a/build/tfs/linux/frozen-check.js b/build/azure-pipelines/linux/frozen-check.js similarity index 100% rename from build/tfs/linux/frozen-check.js rename to build/azure-pipelines/linux/frozen-check.js diff --git a/build/tfs/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml similarity index 85% rename from build/tfs/linux/product-build-linux.yml rename to build/azure-pipelines/linux/product-build-linux.yml index 12269a80cfb..ff877d440b7 100644 --- a/build/tfs/linux/product-build-linux.yml +++ b/build/azure-pipelines/linux/product-build-linux.yml @@ -20,7 +20,7 @@ steps: npm run monaco-compile-check npm run strict-null-check VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" npm run gulp -- mixin - node build/tfs/common/installDistro.js + node build/azure-pipelines/common/installDistro.js node build/lib/builtInExtensions.js - script: | @@ -63,10 +63,10 @@ steps: AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \ AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \ MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \ - node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH" + node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_LINUX" archive-unsigned "$TARBALL_FILENAME" "$VERSION" true "$TARBALL_PATH" # Publish hockeyapp symbols - node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)" + node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" "$(VSCODE_HOCKEYAPP_ID_LINUX64)" # Publish DEB npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-deb" @@ -78,7 +78,7 @@ steps: AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \ AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \ MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \ - node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH" + node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_DEB" package "$DEB_FILENAME" "$VERSION" true "$DEB_PATH" # Publish RPM npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-build-rpm" @@ -90,7 +90,7 @@ steps: AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \ AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \ MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \ - node build/tfs/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH" + node build/azure-pipelines/common/publish.js "$VSCODE_QUALITY" "$PLATFORM_RPM" package "$RPM_FILENAME" "$VERSION" true "$RPM_PATH" # Publish Snap npm run gulp -- "vscode-linux-$(VSCODE_ARCH)-prepare-snap" diff --git a/build/tfs/linux/snap-build-linux.yml b/build/azure-pipelines/linux/snap-build-linux.yml similarity index 90% rename from build/tfs/linux/snap-build-linux.yml rename to build/azure-pipelines/linux/snap-build-linux.yml index d38659aa189..29252107f46 100644 --- a/build/tfs/linux/snap-build-linux.yml +++ b/build/azure-pipelines/linux/snap-build-linux.yml @@ -39,4 +39,4 @@ steps: AZURE_DOCUMENTDB_MASTERKEY="$(AZURE_DOCUMENTDB_MASTERKEY)" \ AZURE_STORAGE_ACCESS_KEY_2="$(AZURE_STORAGE_ACCESS_KEY_2)" \ MOONCAKE_STORAGE_ACCESS_KEY="$(MOONCAKE_STORAGE_ACCESS_KEY)" \ - node build/tfs/common/publish.js "$VSCODE_QUALITY" "linux-snap-$ARCH" package "$SNAP_FILENAME" "$VERSION" true "$SNAP_PATH" \ No newline at end of file + 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/tfs/linux/xvfb.init b/build/azure-pipelines/linux/xvfb.init similarity index 100% rename from build/tfs/linux/xvfb.init rename to build/azure-pipelines/linux/xvfb.init diff --git a/build/tfs/product-build.yml b/build/azure-pipelines/product-build.yml similarity index 100% rename from build/tfs/product-build.yml rename to build/azure-pipelines/product-build.yml diff --git a/build/tfs/win32/ESRPClient/NuGet.config b/build/azure-pipelines/win32/ESRPClient/NuGet.config similarity index 100% rename from build/tfs/win32/ESRPClient/NuGet.config rename to build/azure-pipelines/win32/ESRPClient/NuGet.config diff --git a/build/tfs/win32/ESRPClient/packages.config b/build/azure-pipelines/win32/ESRPClient/packages.config similarity index 100% rename from build/tfs/win32/ESRPClient/packages.config rename to build/azure-pipelines/win32/ESRPClient/packages.config diff --git a/build/tfs/win32/continuous-build-win32.yml b/build/azure-pipelines/win32/continuous-build-win32.yml similarity index 100% rename from build/tfs/win32/continuous-build-win32.yml rename to build/azure-pipelines/win32/continuous-build-win32.yml diff --git a/build/tfs/win32/exec.ps1 b/build/azure-pipelines/win32/exec.ps1 similarity index 100% rename from build/tfs/win32/exec.ps1 rename to build/azure-pipelines/win32/exec.ps1 diff --git a/build/tfs/win32/import-esrp-auth-cert.ps1 b/build/azure-pipelines/win32/import-esrp-auth-cert.ps1 similarity index 100% rename from build/tfs/win32/import-esrp-auth-cert.ps1 rename to build/azure-pipelines/win32/import-esrp-auth-cert.ps1 diff --git a/build/tfs/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml similarity index 79% rename from build/tfs/win32/product-build-win32.yml rename to build/azure-pipelines/win32/product-build-win32.yml index 5c2486c1d2b..c4922708cbd 100644 --- a/build/tfs/win32/product-build-win32.yml +++ b/build/azure-pipelines/win32/product-build-win32.yml @@ -13,7 +13,7 @@ steps: addToPath: true - powershell: | - . build/tfs/win32/exec.ps1 + . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" "machine monacotools.visualstudio.com password $(VSO_PAT)" | Out-File "$env:USERPROFILE\_netrc" -Encoding ASCII $env:npm_config_arch="$(VSCODE_ARCH)" @@ -24,11 +24,11 @@ steps: exec { npm run monaco-compile-check } exec { npm run strict-null-check } exec { npm run gulp -- mixin } - exec { node build/tfs/common/installDistro.js } + exec { node build/azure-pipelines/common/installDistro.js } exec { node build/lib/builtInExtensions.js } - powershell: | - . build/tfs/win32/exec.ps1 + . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" $env:VSCODE_MIXIN_PASSWORD="$(VSCODE_MIXIN_PASSWORD)" exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-min" } @@ -36,7 +36,7 @@ steps: name: build - powershell: | - . build/tfs/win32/exec.ps1 + . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { npm run gulp -- "electron-$(VSCODE_ARCH)" } exec { .\scripts\test.bat --build --tfs "Unit Tests" } @@ -101,9 +101,9 @@ steps: - task: NuGetCommand@2 displayName: Install ESRPClient.exe inputs: - restoreSolution: 'build\tfs\win32\ESRPClient\packages.config' + restoreSolution: 'build\azure-pipelines\win32\ESRPClient\packages.config' feedsToUse: config - nugetConfigPath: 'build\tfs\win32\ESRPClient\NuGet.config' + nugetConfigPath: 'build\azure-pipelines\win32\ESRPClient\NuGet.config' externalFeedCredentials: 3fc0b7f7-da09-4ae7-a9c8-d69824b1819b restoreDirectory: packages @@ -114,11 +114,11 @@ steps: - powershell: | $ErrorActionPreference = "Stop" - .\build\tfs\win32\import-esrp-auth-cert.ps1 -AuthCertificateBase64 $(ESRP_AUTH_CERTIFICATE) -AuthCertificateKey $(ESRP_AUTH_CERTIFICATE_KEY) + .\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/tfs/win32/exec.ps1 + . build/azure-pipelines/win32/exec.ps1 $ErrorActionPreference = "Stop" exec { npm run gulp -- "vscode-win32-$(VSCODE_ARCH)-archive" "vscode-win32-$(VSCODE_ARCH)-system-setup" "vscode-win32-$(VSCODE_ARCH)-user-setup" --sign } @@ -139,13 +139,13 @@ steps: $assetPlatform = if ("$(VSCODE_ARCH)" -eq "ia32") { "win32" } else { "win32-x64" } - exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip } - exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe } - exec { node build/tfs/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe } + exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-archive" archive "VSCode-win32-$(VSCODE_ARCH)-$Version.zip" $Version true $Zip } + exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform" setup "VSCodeSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $SystemExe } + exec { node build/azure-pipelines/common/publish.js $Quality "$global:assetPlatform-user" setup "VSCodeUserSetup-$(VSCODE_ARCH)-$Version.exe" $Version true $UserExe } # publish hockeyapp symbols $hockeyAppId = if ("$(VSCODE_ARCH)" -eq "ia32") { "$(VSCODE_HOCKEYAPP_ID_WIN32)" } else { "$(VSCODE_HOCKEYAPP_ID_WIN64)" } - exec { node build/tfs/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId } + exec { node build/azure-pipelines/common/symbols.js "$(VSCODE_MIXIN_PASSWORD)" "$(VSCODE_HOCKEYAPP_TOKEN)" "$(VSCODE_ARCH)" $hockeyAppId } - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 displayName: 'Component Detection' diff --git a/build/tfs/win32/sign.ps1 b/build/azure-pipelines/win32/sign.ps1 similarity index 100% rename from build/tfs/win32/sign.ps1 rename to build/azure-pipelines/win32/sign.ps1 diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index 5e6ff969c3b..16d187ffc2c 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -84,8 +84,8 @@ const indentationFilter = [ '!**/*.{svg,exe,png,bmp,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns}', '!build/{lib,tslintRules}/**/*.js', '!build/**/*.sh', - '!build/tfs/**/*.js', - '!build/tfs/**/*.config', + '!build/azure-pipelines/**/*.js', + '!build/azure-pipelines/**/*.config', '!**/Dockerfile', '!**/*.Dockerfile', '!**/*.dockerfile', diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js index b73b4f3d346..1cfc5b4c4f7 100644 --- a/build/gulpfile.vscode.win32.js +++ b/build/gulpfile.vscode.win32.js @@ -25,7 +25,7 @@ const zipPath = arch => path.join(zipDir(arch), `VSCode-win32-${arch}.zip`); const setupDir = (arch, target) => path.join(repoPath, '.build', `win32-${arch}`, `${target}-setup`); const issPath = path.join(__dirname, 'win32', 'code.iss'); const innoSetupPath = path.join(path.dirname(path.dirname(require.resolve('innosetup-compiler'))), 'bin', 'ISCC.exe'); -const signPS1 = path.join(repoPath, 'build', 'tfs', 'win32', 'sign.ps1'); +const signPS1 = path.join(repoPath, 'build', 'azure-pipelines', 'win32', 'sign.ps1'); function packageInnoSetup(iss, options, cb) { options = options || {}; diff --git a/build/tfs/continuous-build.yml b/build/tfs/continuous-build.yml deleted file mode 100644 index 76cb7e25802..00000000000 --- a/build/tfs/continuous-build.yml +++ /dev/null @@ -1,18 +0,0 @@ -jobs: -- job: Windows - pool: - vmImage: VS2017-Win2016 - steps: - - template: win32/continuous-build-win32.yml - -- job: Linux - pool: - vmImage: 'Ubuntu-16.04' - steps: - - template: linux/continuous-build-linux.yml - -- job: macOS - pool: - vmImage: macOS 10.13 - steps: - - template: darwin/continuous-build-darwin.yml \ No newline at end of file