diff --git a/build/azure-pipelines/darwin/createDrop.sh b/build/azure-pipelines/darwin/createDrop.sh index 3e7fb6c452..02b66ceae1 100755 --- a/build/azure-pipelines/darwin/createDrop.sh +++ b/build/azure-pipelines/darwin/createDrop.sh @@ -6,6 +6,6 @@ REPO="$(pwd)" mkdir -p $REPO/.build/darwin/{archive,server} # package Remote Extension Host -pushd .. && mv azuredatastudio-reh-darwin azuredatastudio-server-darwin && zip -Xry $REPO/.build/darwin/server/azuredatastudio-server-darwin.zip azuredatastudio-server-darwin && popd +# pushd .. && mv azuredatastudio-reh-darwin azuredatastudio-server-darwin && zip -Xry $REPO/.build/darwin/server/azuredatastudio-server-darwin.zip azuredatastudio-server-darwin && popd node build/azure-pipelines/common/copyArtifacts.js diff --git a/build/azure-pipelines/darwin/sql-product-build-darwin.yml b/build/azure-pipelines/darwin/sql-product-build-darwin.yml index 3641a01ea5..1dcd0b2901 100644 --- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml +++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml @@ -27,7 +27,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: @@ -96,8 +96,8 @@ steps: set -e yarn gulp package-rebuild-extensions yarn gulp vscode-darwin-min-ci - yarn gulp vscode-reh-darwin-min-ci - yarn gulp vscode-reh-web-darwin-min-ci + # yarn gulp vscode-reh-darwin-min-ci + # yarn gulp vscode-reh-web-darwin-min-ci displayName: Build env: VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password) diff --git a/build/azure-pipelines/docker/sql-product-build-docker.yml b/build/azure-pipelines/docker/sql-product-build-docker.yml index c4fefdcd53..d33130ccad 100644 --- a/build/azure-pipelines/docker/sql-product-build-docker.yml +++ b/build/azure-pipelines/docker/sql-product-build-docker.yml @@ -1,7 +1,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: diff --git a/build/azure-pipelines/linux/createDrop.sh b/build/azure-pipelines/linux/createDrop.sh index c3f8e55153..9605fd7b9a 100755 --- a/build/azure-pipelines/linux/createDrop.sh +++ b/build/azure-pipelines/linux/createDrop.sh @@ -15,12 +15,12 @@ rm -rf $ROOT/code-*.tar.* (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME) # Publish Remote Extension Host -LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX" -SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX" -SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz" -SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME" +# LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX" +# SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX" +# SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz" +# SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME" -rm -rf $ROOT/azuredatastudio-server-*.tar.* -(cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME) +# rm -rf $ROOT/azuredatastudio-server-*.tar.* +# (cd $ROOT && mv $LEGACY_SERVER_BUILD_NAME $SERVER_BUILD_NAME && tar --owner=0 --group=0 -czf $SERVER_TARBALL_PATH $SERVER_BUILD_NAME) node build/azure-pipelines/common/copyArtifacts.js diff --git a/build/azure-pipelines/linux/sql-product-build-linux.yml b/build/azure-pipelines/linux/sql-product-build-linux.yml index 9821bb9780..b56f3c74bc 100644 --- a/build/azure-pipelines/linux/sql-product-build-linux.yml +++ b/build/azure-pipelines/linux/sql-product-build-linux.yml @@ -24,7 +24,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: @@ -91,8 +91,8 @@ steps: - script: | set -e yarn gulp vscode-linux-x64-min-ci - yarn gulp vscode-reh-linux-x64-min-ci - yarn gulp vscode-reh-web-linux-x64-min-ci + # yarn gulp vscode-reh-linux-x64-min-ci + # yarn gulp vscode-reh-web-linux-x64-min-ci displayName: Build env: VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password) diff --git a/build/azure-pipelines/sql-product-build.yml b/build/azure-pipelines/sql-product-build.yml index 783b4efe31..0e59eea346 100644 --- a/build/azure-pipelines/sql-product-build.yml +++ b/build/azure-pipelines/sql-product-build.yml @@ -49,27 +49,27 @@ jobs: extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects"] timeoutInMinutes: 70 -- job: LinuxWeb - condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true')) - pool: - vmImage: 'Ubuntu-16.04' - container: linux-x64 - variables: - VSCODE_ARCH: x64 - dependsOn: - - Compile - steps: - - template: web/sql-product-build-web.yml +# - job: LinuxWeb +# condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true')) +# pool: +# vmImage: 'Ubuntu-16.04' +# container: linux-x64 +# variables: +# VSCODE_ARCH: x64 +# dependsOn: +# - Compile +# steps: +# - template: web/sql-product-build-web.yml -- job: Docker - condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true')) - pool: - vmImage: 'Ubuntu-16.04' - container: linux-x64 - dependsOn: - - Linux - steps: - - template: docker/sql-product-build-docker.yml +# - job: Docker +# condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true')) +# pool: +# vmImage: 'Ubuntu-16.04' +# container: linux-x64 +# dependsOn: +# - Linux +# steps: +# - template: docker/sql-product-build-docker.yml - job: Windows condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true')) @@ -98,10 +98,10 @@ jobs: dependsOn: - macOS - Linux - - Docker + # - Docker - Windows - Windows_Test - - LinuxWeb + # - LinuxWeb - macOS_Signing steps: - template: sql-release.yml diff --git a/build/azure-pipelines/sql-product-compile.yml b/build/azure-pipelines/sql-product-compile.yml index cbfd39775e..2f1ff22fc4 100644 --- a/build/azure-pipelines/sql-product-compile.yml +++ b/build/azure-pipelines/sql-product-compile.yml @@ -15,7 +15,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: diff --git a/build/azure-pipelines/web/sql-product-build-web.yml b/build/azure-pipelines/web/sql-product-build-web.yml index d3d7c2b137..1c429e93e7 100644 --- a/build/azure-pipelines/web/sql-product-build-web.yml +++ b/build/azure-pipelines/web/sql-product-build-web.yml @@ -21,7 +21,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: diff --git a/build/azure-pipelines/win32/createDrop.ps1 b/build/azure-pipelines/win32/createDrop.ps1 index 4552c2014e..a2535224b7 100644 --- a/build/azure-pipelines/win32/createDrop.ps1 +++ b/build/azure-pipelines/win32/createDrop.ps1 @@ -5,16 +5,16 @@ $Arch = "x64" $Repo = "$(pwd)" $Root = "$Repo\.." -$LegacyServer = "$Root\azuredatastudio-reh-win32-$Arch" -$ServerName = "azuredatastudio-server-win32-$Arch" -$Server = "$Root\$ServerName" -$ServerZipLocation = "$Repo\.build\win32-$Arch\server" -$ServerZip = "$ServerZipLocation\azuredatastudio-server-win32-$Arch.zip" +# $LegacyServer = "$Root\azuredatastudio-reh-win32-$Arch" +# $ServerName = "azuredatastudio-server-win32-$Arch" +# $Server = "$Root\$ServerName" +# $ServerZipLocation = "$Repo\.build\win32-$Arch\server" +# $ServerZip = "$ServerZipLocation\azuredatastudio-server-win32-$Arch.zip" # Create server archive -New-Item $ServerZipLocation -ItemType Directory # this will throw even when success for we don't want to exec this -$global:LASTEXITCODE = 0 -exec { Rename-Item -Path $LegacyServer -NewName $ServerName } "Rename Item" -exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r } "Zip Server" +# New-Item $ServerZipLocation -ItemType Directory # this will throw even when success for we don't want to exec this +# $global:LASTEXITCODE = 0 +# exec { Rename-Item -Path $LegacyServer -NewName $ServerName } "Rename Item" +# exec { .\node_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r } "Zip Server" exec { node build/azure-pipelines/common/copyArtifacts.js } "Copy Artifacts" diff --git a/build/azure-pipelines/win32/sql-product-build-win32.yml b/build/azure-pipelines/win32/sql-product-build-win32.yml index 94a50e7009..8e71c6df47 100644 --- a/build/azure-pipelines/win32/sql-product-build-win32.yml +++ b/build/azure-pipelines/win32/sql-product-build-win32.yml @@ -21,7 +21,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: @@ -95,8 +95,8 @@ steps: $ErrorActionPreference = "Stop" exec { yarn gulp "package-rebuild-extensions" } exec { yarn gulp "vscode-win32-x64-min-ci" } - exec { yarn gulp "vscode-reh-win32-x64-min-ci" } - exec { yarn gulp "vscode-reh-web-win32-x64-min-ci" } + # exec { yarn gulp "vscode-reh-win32-x64-min-ci" } + # exec { yarn gulp "vscode-reh-web-win32-x64-min-ci" } exec { yarn gulp "vscode-win32-x64-code-helper" } exec { yarn gulp "vscode-win32-x64-inno-updater" } displayName: Build diff --git a/build/azure-pipelines/win32/sql-product-test-win32.yml b/build/azure-pipelines/win32/sql-product-test-win32.yml index 7ebfe3aa60..43026abfb8 100644 --- a/build/azure-pipelines/win32/sql-product-test-win32.yml +++ b/build/azure-pipelines/win32/sql-product-test-win32.yml @@ -1,7 +1,7 @@ steps: - task: NodeTool@0 inputs: - versionSpec: "12.14.1" + versionSpec: "12.13.0" - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@3 inputs: diff --git a/package.json b/package.json index e0d15a174f..011e889f81 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "azuredatastudio", "version": "1.21.0", - "distro": "e639a9429632218aae8642e167736ff803370586", + "distro": "dc12b882b77fbc89b4ea8c8271a51c4eb579cdaa", "author": { "name": "Microsoft Corporation" }, diff --git a/test/smoke/src/sql/main.ts b/test/smoke/src/sql/main.ts index 33cc1c54a0..d319101642 100644 --- a/test/smoke/src/sql/main.ts +++ b/test/smoke/src/sql/main.ts @@ -27,7 +27,7 @@ const PLATFORM = '${PLATFORM}'; const RUNTIME = '${RUNTIME}'; const VERSION = '${VERSION}'; -const sqliteUrl = `https://github.com/anthonydresser/azuredatastudio-sqlite/releases/download/1.0.15/azuredatastudio-sqlite-${PLATFORM}-${RUNTIME}-${VERSION}.zip`; +const sqliteUrl = `https://github.com/anthonydresser/azuredatastudio-sqlite/releases/download/1.0.16/azuredatastudio-sqlite-${PLATFORM}-${RUNTIME}-${VERSION}.zip`; export async function setup(app: ApplicationOptions): Promise { console.log('*** Downloading test extensions');