ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'publish/server' into main

Browse Source
This commit is contained in:
Anthony Dresser
2020-08-10 19:09:25 -07:00
parent 39900b7a92 a721ab559d
commit 1f71ea301c
8 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/azure-pipelines/darwin/createDrop.sh
View File

@@ -6,6 +6,6 @@ REPO="$(pwd)"
mkdir -p $REPO/.build/darwin/{archive,server} mkdir -p $REPO/.build/darwin/{archive,server}
# package Remote Extension Host # 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 node build/azure-pipelines/common/copyArtifacts.js

4
build/azure-pipelines/darwin/sql-product-build-darwin.yml
View File

@@ -96,8 +96,8 @@ steps:
set -e set -e
yarn gulp package-rebuild-extensions yarn gulp package-rebuild-extensions
yarn gulp vscode-darwin-min-ci yarn gulp vscode-darwin-min-ci
# yarn gulp vscode-reh-darwin-min-ci yarn gulp vscode-reh-darwin-min-ci
# yarn gulp vscode-reh-web-darwin-min-ci yarn gulp vscode-reh-web-darwin-min-ci
displayName: Build displayName: Build
env: env:
VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password) VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)

12
build/azure-pipelines/linux/createDrop.sh
View File

@@ -15,12 +15,12 @@ rm -rf $ROOT/code-*.tar.*
(cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME) (cd $ROOT && tar -czf $TARBALL_PATH $BUILDNAME)
# Publish Remote Extension Host # Publish Remote Extension Host
# LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX" LEGACY_SERVER_BUILD_NAME="azuredatastudio-reh-$PLATFORM_LINUX"
# SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX" SERVER_BUILD_NAME="azuredatastudio-server-$PLATFORM_LINUX"
# SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz" SERVER_TARBALL_FILENAME="azuredatastudio-server-$PLATFORM_LINUX.tar.gz"
# SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME" SERVER_TARBALL_PATH="$REPO/.build/linux/server/$SERVER_TARBALL_FILENAME"
# rm -rf $ROOT/azuredatastudio-server-*.tar.* 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) (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 node build/azure-pipelines/common/copyArtifacts.js

4
build/azure-pipelines/linux/sql-product-build-linux.yml
View File

@@ -91,8 +91,8 @@ steps:
- script: | - script: |
set -e set -e
yarn gulp vscode-linux-x64-min-ci yarn gulp vscode-linux-x64-min-ci
# yarn gulp vscode-reh-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-web-linux-x64-min-ci
displayName: Build displayName: Build
env: env:
VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password) VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)

44
build/azure-pipelines/sql-product-build.yml
View File

@@ -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"] extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azdata", "azurecore", "cms", "dacpac", "import", "schema-compare", "notebook", "resource-deployment", "machine-learning", "sql-database-projects"]
timeoutInMinutes: 70 timeoutInMinutes: 70
# - job: LinuxWeb - job: LinuxWeb
# condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true')) condition: and(succeeded(), eq(variables['VSCODE_BUILD_WEB'], 'true'))
# pool: pool:
# vmImage: 'Ubuntu-16.04' vmImage: 'Ubuntu-16.04'
# container: linux-x64 container: linux-x64
# variables: variables:
# VSCODE_ARCH: x64 VSCODE_ARCH: x64
# dependsOn: dependsOn:
# - Compile - Compile
# steps: steps:
# - template: web/sql-product-build-web.yml - template: web/sql-product-build-web.yml
# - job: Docker - job: Docker
# condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true')) condition: and(succeeded(), eq(variables['VSCODE_BUILD_DOCKER'], 'true'))
# pool: pool:
# vmImage: 'Ubuntu-16.04' vmImage: 'Ubuntu-16.04'
# container: linux-x64 container: linux-x64
# dependsOn: dependsOn:
# - Linux - Linux
# steps: steps:
# - template: docker/sql-product-build-docker.yml - template: docker/sql-product-build-docker.yml
- job: Windows - job: Windows
condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true')) condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
@@ -98,10 +98,10 @@ jobs:
dependsOn: dependsOn:
- macOS - macOS
- Linux - Linux
# - Docker - Docker
- Windows - Windows
- Windows_Test - Windows_Test
# - LinuxWeb - LinuxWeb
- macOS_Signing - macOS_Signing
steps: steps:
- template: sql-release.yml - template: sql-release.yml

18
build/azure-pipelines/win32/createDrop.ps1
View File

@@ -5,16 +5,16 @@ $Arch = "x64"
$Repo = "$(pwd)" $Repo = "$(pwd)"
$Root = "$Repo\.." $Root = "$Repo\.."
# $LegacyServer = "$Root\azuredatastudio-reh-win32-$Arch" $LegacyServer = "$Root\azuredatastudio-reh-win32-$Arch"
# $ServerName = "azuredatastudio-server-win32-$Arch" $ServerName = "azuredatastudio-server-win32-$Arch"
# $Server = "$Root\$ServerName" $Server = "$Root\$ServerName"
# $ServerZipLocation = "$Repo\.build\win32-$Arch\server" $ServerZipLocation = "$Repo\.build\win32-$Arch\server"
# $ServerZip = "$ServerZipLocation\azuredatastudio-server-win32-$Arch.zip" $ServerZip = "$ServerZipLocation\azuredatastudio-server-win32-$Arch.zip"
# Create server archive # Create server archive
# New-Item $ServerZipLocation -ItemType Directory # this will throw even when success for we don't want to exec this New-Item $ServerZipLocation -ItemType Directory # this will throw even when success for we don't want to exec this
# $global:LASTEXITCODE = 0 $global:LASTEXITCODE = 0
# exec { Rename-Item -Path $LegacyServer -NewName $ServerName } "Rename Item" 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_modules\7zip\7zip-lite\7z.exe a -tzip $ServerZip $Server -r } "Zip Server"
exec { node build/azure-pipelines/common/copyArtifacts.js } "Copy Artifacts" exec { node build/azure-pipelines/common/copyArtifacts.js } "Copy Artifacts"

4
build/azure-pipelines/win32/sql-product-build-win32.yml
View File

@@ -95,8 +95,8 @@ steps:
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"
exec { yarn gulp "package-rebuild-extensions" } exec { yarn gulp "package-rebuild-extensions" }
exec { yarn gulp "vscode-win32-x64-min-ci" } exec { yarn gulp "vscode-win32-x64-min-ci" }
# exec { yarn gulp "vscode-reh-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-web-win32-x64-min-ci" }
exec { yarn gulp "vscode-win32-x64-code-helper" } exec { yarn gulp "vscode-win32-x64-code-helper" }
exec { yarn gulp "vscode-win32-x64-inno-updater" } exec { yarn gulp "vscode-win32-x64-inno-updater" }
displayName: Build displayName: Build

2
package.json
View File

@@ -1,7 +1,7 @@
{ {
"name": "azuredatastudio", "name": "azuredatastudio",
"version": "1.21.0", "version": "1.21.0",
"distro": "ab90f5eca37881351ad003e5d38b03b43c177809", "distro": "facf51cc91bfb7ca0d4f5904480c1e7f09c3c115",
"author": { "author": {
"name": "Microsoft Corporation" "name": "Microsoft Corporation"
}, },