Add Apple Silicon build and Universal build for macOS (#20776)

* use stages * fix indention * add jobs section * fix error * indention * arm64 for macos * other stages not run * fix container * fix * fix stage * skip tests * variable * dependency * fix name error * sts * const * fall back to x64 * pass in variable * universal flavor * fix universal * fix path * remove * special processing * return on error * copy instead of move * restore sts * release * fix error * Fix readme * remove commented code * add comments * add issue * update comment * pr comments * delete universal yml * update the generated js file
2026-02-17 02:51:36 -05:00 · 2022-10-10 19:02:56 -07:00
parent bd8e9ec0f0
commit ee2905d372
9 changed files with 277 additions and 107 deletions
--- a/build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin-signing.yml
@@ -9,12 +9,12 @@ steps:
    displayName: 'Download Build Artifacts'
    inputs:
      downloadType: specific
-      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-unsigned.zip'
+      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip'
      downloadPath: '$(Build.SourcesDirectory)/.build/'

  - script: |
      pushd $(Build.SourcesDirectory)/.build/drop/darwin/archive
-      mv azuredatastudio-darwin-unsigned.zip azuredatastudio-darwin.zip
+      mv azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip azuredatastudio-darwin-$(VSCODE_ARCH).zip
    displayName: 'Rename the file'

  - task: UseDotNet@2
@@ -29,7 +29,7 @@ steps:
    inputs:
      ConnectedServiceName: 'Code Signing'
      FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
+      Pattern: 'azuredatastudio-darwin-$(VSCODE_ARCH).zip'
      signConfigType: inlineSignParams
      inlineOperation: |
        [
@@ -47,7 +47,7 @@ steps:
    condition: and(succeeded(), eq(variables['signed'], true))

  - script: |
-      zip -d $(Build.SourcesDirectory)/.build/drop/darwin/archive/azuredatastudio-darwin.zip "*.pkg"
+      zip -d $(Build.SourcesDirectory)/.build/drop/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH).zip "*.pkg"
    displayName: Clean Archive
    condition: and(succeeded(), eq(variables['signed'], true))

@@ -56,7 +56,7 @@ steps:
    inputs:
      ConnectedServiceName: 'Code Signing'
      FolderPath: '$(Build.SourcesDirectory)/.build/drop/darwin/archive'
-      Pattern: 'azuredatastudio-darwin.zip'
+      Pattern: 'azuredatastudio-darwin-$(VSCODE_ARCH).zip'
      signConfigType: inlineSignParams
      inlineOperation: |
        [
--- a/build/azure-pipelines/darwin/sql-product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/sql-product-build-darwin.yml
@@ -52,7 +52,7 @@ steps:

  - script: |
      mkdir -p .build
-      node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js > .build/yarnlockhash
+      node build/azure-pipelines/common/sql-computeNodeModulesCacheKey.js $(NPM_CONFIG_ARCH) > .build/yarnlockhash
    displayName: Prepare yarn cache key

  - task: Cache@2
@@ -71,6 +71,7 @@ steps:

  - script: |
      set -e
+      export npm_config_arch=$(NPM_CONFIG_ARCH)
      CHILD_CONCURRENCY=1 yarn --frozen-lockfile
    displayName: Install dependencies
    env:
@@ -99,10 +100,11 @@ steps:
  - script: |
      set -e
      yarn gulp package-rebuild-extensions
-      yarn gulp vscode-darwin-x64-min-ci
+      yarn gulp vscode-darwin-$(VSCODE_ARCH)-min-ci
    displayName: Build
    env:
      VSCODE_MIXIN_PASSWORD: $(github-distro-mixin-password)
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))

  - script: |
      set -e
@@ -115,7 +117,7 @@ steps:
      # including the remote server and configure the integration tests
      # to run with these builds instead of running out of sources.
      set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
      APP_NAME="`ls $APP_ROOT | head -n 1`"
      INTEGRATION_TEST_ELECTRON_PATH="$APP_ROOT/$APP_NAME/Contents/MacOS/Electron" \
      VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/azuredatastudio-reh-darwin" \
@@ -127,12 +129,13 @@ steps:
      set -e
      yarn gulp compile-extensions
    displayName: Compile Extensions
+    condition: and(succeeded(), ne(variables['VSCODE_ARCH'], 'universal'))

  # Per https://developercommunity.visualstudio.com/t/variablesexpressions-dont-work-with-continueonerro/1187733 we can't use variables
  # in continueOnError directly so instead make two copies of the task and only run one or the other based on the SMOKE_FAIL_ON_ERROR value
  - script: |
      set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
      APP_NAME="`ls $APP_ROOT | head -n 1`"
      yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
    displayName: Run smoke tests (Electron) (Continue on Error)
@@ -141,7 +144,7 @@ steps:

  - script: |
      set -e
-      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-x64
+      APP_ROOT=$(agent.builddirectory)/azuredatastudio-darwin-$(VSCODE_ARCH)
      APP_NAME="`ls $APP_ROOT | head -n 1`"
      yarn smoketest --build "$APP_ROOT/$APP_NAME" --screenshots "$(build.artifactstagingdirectory)/smokeshots" --log "$(build.artifactstagingdirectory)/logs/darwin/smoke.log" --extensionsDir "$(build.sourcesdirectory)/extensions"
    displayName: Run smoke tests (Electron) (Fail on Error)
@@ -156,9 +159,25 @@ steps:
  #   continueOnError: true
  #   condition: and(succeeded(), eq(variables['RUN_TESTS'], 'true'))

+  - task: DownloadBuildArtifacts@0
+    displayName: 'Download arm64 and x64 packages'
+    inputs:
+      downloadType: specific
+      itemPattern: 'drop/darwin/archive/azuredatastudio-darwin-@(arm64|x64)-unsigned.zip'
+      downloadPath: $(agent.builddirectory)
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
  - script: |
      set -e
-      pushd ../azuredatastudio-darwin-x64
+      unzip $(agent.builddirectory)/drop/darwin/archive/azuredatastudio-darwin-x64-unsigned.zip -d $(agent.builddirectory)/azuredatastudio-darwin-x64
+      unzip $(agent.builddirectory)/drop/darwin/archive/azuredatastudio-darwin-arm64-unsigned.zip -d $(agent.builddirectory)/azuredatastudio-darwin-arm64
+      DEBUG=* node build/darwin/create-universal-app.js
+    displayName: Create Universal App
+    condition: and(succeeded(), eq(variables['VSCODE_ARCH'], 'universal'))
+
+  - script: |
+      set -e
+      pushd ../azuredatastudio-darwin-$(VSCODE_ARCH)
      ls

      echo "Cleaning the application"
@@ -188,8 +207,8 @@ steps:
  - script: |
      set -e
      mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin-x64
-      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin.zip
+      pushd ../azuredatastudio-darwin-$(VSCODE_ARCH)
+      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH).zip
      popd
    displayName: 'Archive (no signing)'
    condition: and(succeeded(), eq(variables['signed'], false))
@@ -197,8 +216,8 @@ steps:
  - script: |
      set -e
      mkdir -p .build/darwin/archive
-      pushd ../azuredatastudio-darwin-x64
-      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-unsigned.zip
+      pushd ../azuredatastudio-darwin-$(VSCODE_ARCH)
+      ditto -c -k --keepParent *.app $(Build.SourcesDirectory)/.build/darwin/archive/azuredatastudio-darwin-$(VSCODE_ARCH)-unsigned.zip
      popd
    displayName: 'Archive'
    condition: and(succeeded(), eq(variables['signed'], true))
--- a/build/azure-pipelines/darwin/sql-publish.ps1
+++ b/build/azure-pipelines/darwin/sql-publish.ps1
@@ -13,12 +13,22 @@ $Version = $VersionJson.version
 $Quality = $VersionJson.quality
 $CommitId = $VersionJson.commit

-$ZipName = "azuredatastudio-darwin.zip"
-$Zip = "$artifactsDir\darwin\archive\$ZipName"
-$UploadName = "azuredatastudio-macos-$Version"
+$Flavors = "x64","arm64","universal"
+$FlavorSuffixes = "","-arm64","-universal"

-If (-NOT ($Quality -eq "stable")) {
-	$UploadName = "$UploadName-$Quality"
+For($i = 0; $i -lt $Flavors.Length; $i++)
+{
+	$Flavor = $Flavors[$i]
+	$FlavorSuffix = $FlavorSuffixes[$i]
+	$ZipName = "azuredatastudio-darwin-$Flavor.zip"
+	$Zip = "$artifactsDir\darwin\archive\$ZipName"
+	$UploadName = "azuredatastudio-macos$FlavorSuffix-$Version"
+
+	If (-NOT ($Quality -eq "stable")) {
+		$UploadName = "$UploadName-$Quality"
+	}
+
+	$Platform = "darwin$FlavorSuffix"
+
+	node $sourcesDir\build\azure-pipelines\common\publish.js $Quality $Platform archive "$UploadName.zip" $Version true $Zip $CommitId
 }
-
-node $sourcesDir\build\azure-pipelines\common\publish.js $Quality darwin archive "$UploadName.zip" $Version true $Zip $CommitId
--- a/build/azure-pipelines/sql-product-build.yml
+++ b/build/azure-pipelines/sql-product-build.yml
@@ -4,87 +4,142 @@ resources:
    image: sqltoolscontainers.azurecr.io/linux-build-agent:6
    endpoint: SqlToolsContainers

-jobs:
- job: Compile
-  pool:
-    vmImage: 'Ubuntu-20.04'
-  container: linux-x64
-  steps:
-  - script: |
-      set -e
-      echo "##vso[build.addbuildtag]$(VSCODE_QUALITY)"
-    displayName: Add Quality Build Tag
-  - template: sql-product-compile.yml
-  timeoutInMinutes: 120
+stages:
+  - stage: Compile
+    jobs:
+    - job: Compile
+      pool:
+        vmImage: 'Ubuntu-20.04'
+      container: linux-x64
+      steps:
+      - script: |
+          set -e
+          echo "##vso[build.addbuildtag]$(VSCODE_QUALITY)"
+        displayName: Add Quality Build Tag
+      - template: sql-product-compile.yml
+      timeoutInMinutes: 120

- job: macOS
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
-  pool:
-    vmImage: 'macos-latest'
-  dependsOn:
-  - Compile
-  steps:
-  - template: darwin/sql-product-build-darwin.yml
-  timeoutInMinutes: 90
+  - stage: macOS
+    condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), ne(variables['VSCODE_QUALITY'], 'saw'))
+    pool:
+      vmImage: 'macos-latest'
+    dependsOn:
+      - Compile
+    jobs:
+      - job: macOS
+        variables:
+          NPM_CONFIG_ARCH: x64
+          VSCODE_ARCH: x64
+        steps:
+        - template: darwin/sql-product-build-darwin.yml
+        timeoutInMinutes: 90

- job: macOS_Signing
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_MACOS'], 'true'), eq(variables['signed'], true), ne(variables['VSCODE_QUALITY'], 'saw'))
-  pool:
-    vmImage: 'macos-latest'
-  dependsOn:
-  - macOS
-  steps:
-  - template: darwin/sql-product-build-darwin-signing.yml
-  timeoutInMinutes: 60
+      - job: macOS_Signing
+        variables:
+          VSCODE_ARCH: x64
+        condition: and(succeeded(), eq(variables['signed'], true))
+        dependsOn:
+        - macOS
+        steps:
+        - template: darwin/sql-product-build-darwin-signing.yml
+        timeoutInMinutes: 60

- job: Linux
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], 'true'))
-  pool:
-    vmImage: 'Ubuntu-20.04'
-  container: linux-x64
-  dependsOn:
-  - Compile
-  steps:
-  - template: linux/sql-product-build-linux.yml
-    parameters:
-      extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azcli", "azurecore", "cms", "dacpac", "data-workspace", "import", "machine-learning", "notebook", "resource-deployment", "schema-compare", "sql-bindings", "sql-database-projects"]
-  timeoutInMinutes: 90
+      - job: macOS_ARM64
+        variables:
+          NPM_CONFIG_ARCH: arm64
+          VSCODE_ARCH: arm64
+          # Do not run tests for arm64 build
+          RUN_TESTS: false
+          RUN_SMOKE_TESTS: false
+        steps:
+        - template: darwin/sql-product-build-darwin.yml
+        timeoutInMinutes: 90

- job: Windows
-  condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
-  pool:
-    vmImage: 'windows-2019'
-  dependsOn:
-  - Compile
-  steps:
-  - template: win32/sql-product-build-win32.yml
-  timeoutInMinutes: 90
+      - job: macOS_Signing_ARM64
+        variables:
+          VSCODE_ARCH: arm64
+        condition: and(succeeded(), eq(variables['signed'], true))
+        dependsOn:
+        - macOS_ARM64
+        steps:
+        - template: darwin/sql-product-build-darwin-signing.yml
+        timeoutInMinutes: 60

-# disable due to invalid machine pool (karlb 3/9/2022)
-# - job: Windows_Test
-#   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
-#   pool:
-#     name: mssqltools
-#   dependsOn:
-#   - Linux
-#   - Windows
-#   steps:
-#   - template: win32/sql-product-test-win32.yml
-#   timeoutInMinutes: 90
+      - job: macOS_Universal
+        variables:
+          NPM_CONFIG_ARCH: x64
+          VSCODE_ARCH: universal
+          # Do not run tests for universal build
+          RUN_TESTS: false
+          RUN_SMOKE_TESTS: false
+        dependsOn:
+        - macOS
+        - macOS_ARM64
+        steps:
+        - template: darwin/sql-product-build-darwin.yml
+        timeoutInMinutes: 90

- job: Release
-  condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['Build.Reason'], 'Schedule'))))
-  pool:
-    vmImage: 'Ubuntu-20.04'
-  dependsOn:
-  - macOS
-  - Linux
-  - Windows
-# disable due to invalid machine pool (karlb 3/9/2022)
-#  - Windows_Test
-  - macOS_Signing
-  steps:
-  - template: sql-release.yml
+      - job: macOS_Signing_Universal
+        variables:
+          VSCODE_ARCH: universal
+        condition: and(succeeded(), eq(variables['signed'], true))
+        dependsOn:
+        - macOS_Universal
+        steps:
+        - template: darwin/sql-product-build-darwin-signing.yml
+        timeoutInMinutes: 60
+
+  - stage: Linux
+    condition: and(succeeded(), eq(variables['VSCODE_BUILD_LINUX'], true))
+    dependsOn:
+      - Compile
+    jobs:
+      - job: Linux
+        pool:
+          vmImage: 'Ubuntu-20.04'
+        container: linux-x64
+        steps:
+        - template: linux/sql-product-build-linux.yml
+          parameters:
+            extensionsToUnitTest: ["admin-tool-ext-win", "agent", "azcli", "azurecore", "cms", "dacpac", "data-workspace", "import", "machine-learning", "notebook", "resource-deployment", "schema-compare", "sql-bindings", "sql-database-projects"]
+        timeoutInMinutes: 90
+
+  - stage: Windows
+    condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], true))
+    pool:
+      vmImage: 'windows-2019'
+    dependsOn:
+      - Compile
+    jobs:
+      - job: Windows
+        steps:
+        - template: win32/sql-product-build-win32.yml
+        timeoutInMinutes: 90
+
+    # disable due to invalid machine pool (karlb 3/9/2022)
+    # - job: Windows_Test
+    #   condition: and(succeeded(), eq(variables['VSCODE_BUILD_WIN32'], 'true'))
+    #   pool:
+    #     name: mssqltools
+    #   dependsOn:
+    #   - Linux
+    #   - Windows
+    #   steps:
+    #   - template: win32/sql-product-test-win32.yml
+    #   timeoutInMinutes: 90
+
+  - stage: Release
+    condition: and(succeeded(), or(eq(variables['VSCODE_RELEASE'], 'true'), and(eq(variables['VSCODE_QUALITY'], 'insider'), eq(variables['Build.Reason'], 'Schedule'))))
+    pool:
+      vmImage: 'Ubuntu-20.04'
+    dependsOn:
+      - macOS
+      - Linux
+      - Windows
+    jobs:
+      - job: Release
+        steps:
+        - template: sql-release.yml

 trigger: none
 pr: none