Chromium update and Apple Silicon build

.circleci/config.yml

@@ -33,13 +33,75 @@ commands:
  - run:
  name: Update PowerShell.Archive to fix slash direction
  command: Install-Module Microsoft.PowerShell.Archive -MinimumVersion 1.2.3.0 -Repository PSGallery -Force
+ - run:
+ name: Install Debugging Tools for Windows SDK 10.0.19041.685
+ command: choco install windows-sdk-10-version-2004-windbg
  - attach_workspace:
  at: .\repos
  - run: .\repos\win_scripts\build_kaleido.ps1 <<parameters.arch>>
  - run: python .\repos\kaleido\py\setup.py bundle_hash_artifacts
  - store_artifacts:
  path: ./repos/kaleido/kaleido_artifacts_win_<<parameters.arch>>.zip
 
+ mac_build_blink:
+ parameters:
+ arch:
+ default: "x64"
+ type: string
+ steps:
+ - checkout
+ - run:
+ name: Delete simulators and unused platforms to save space
+ command: |
+ sudo rm -rf /Library/Developer/CoreSimulator
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
+ - attach_workspace:
+ at: ./repos
+ - run:
+ command: ./repos/mac_scripts/build_blink <<parameters.arch>>
+ no_output_timeout: 30m
+ - persist_to_workspace:
+ root: ./repos
+ paths:
+ - src
+ - depot_tools
+ - .gclient
+ - .gclient_entries
+ - kaleido/version
+ - CREDITS.html
+
+ mac_build:
+ parameters:
+ arch:
+ default: "x64"
+ type: string
+ steps:
+ - checkout
+ - run:
+ name: Delete simulators and unused platforms to save space
+ command: |
+ sudo rm -rf /Library/Developer/CoreSimulator
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVOS.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchOS.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/WatchSimulator.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/AppleTVSimulator.platform
+ sudo rm -rf /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform
+ - attach_workspace:
+ at: ./repos
+ - run:
+ command: ./repos/mac_scripts/build_kaleido <<parameters.arch>>
+ no_output_timeout: 30m 
+ - run: python3 ./repos/kaleido/py/setup.py bundle_hash_artifacts
+ - store_artifacts:
+ path: ./repos/kaleido/kaleido_artifacts_mac_<<parameters.arch>>.zip
+
+
 jobs:
  linux_fetch:
  machine: 
@@ -65,6 +127,11 @@ jobs:
  root: ./repos
  paths:
  - src
+ - depot_tools
+ - .gclient
+ - .gclient_entries
+ - kaleido/version
+ - CREDITS.html
 
  linux_build_x64:
  machine: 
@@ -160,41 +227,50 @@ jobs:
  - .gclient
  - .gclient_entries
  - kaleido/version
+ - CREDITS.html
 
- mac_build_blink:
+
+ mac_build_blink_x64:
  macos: # indicate that we are using the macOS executor
- xcode: 11.1.0 # indicate our selected version of Xcode
+ xcode: 12.2.0 # indicate our selected version of Xcode
  resource_class: large
+ environment:
+ KALEIDO_ARCH: "x64"
  steps:
- - checkout
- - attach_workspace:
- at: ./repos
- - run:
- command: ./repos/mac_scripts/build_blink
- no_output_timeout: 30m
- - persist_to_workspace:
- root: ./repos
- paths:
- - src
- - depot_tools
- - .gclient
- - .gclient_entries
-
- mac_build:
+ - mac_build_blink:
+ arch: "x64"
+
+ mac_build_blink_arm64:
  macos: # indicate that we are using the macOS executor
- xcode: 11.1.0 # indicate our selected version of Xcode
+ xcode: 12.2.0 # indicate our selected version of Xcode
  resource_class: large
+ environment:
+ KALEIDO_ARCH: "arm64"
  steps:
- - checkout
- - attach_workspace:
- at: ./repos
- - run:
- command: ./repos/mac_scripts/build_kaleido
- no_output_timeout: 30m 
- - run: python3 ./repos/kaleido/py/setup.py bundle_hash_artifacts
- - store_artifacts:
- path: ./repos/kaleido/kaleido_artifacts_mac.zip
+ - mac_build_blink:
+ arch: "arm64"
+
+
+ mac_build_x64:
+ macos: # indicate that we are using the macOS executor
+ xcode: 12.2.0 # indicate our selected version of Xcode
+ resource_class: large
+ environment:
+ KALEIDO_ARCH: "x64"
+ steps:
+ - mac_build:
+ arch: "x64"
 
+ mac_build_arm64:
+ macos: # indicate that we are using the macOS executor
+ xcode: 12.2.0 # indicate our selected version of Xcode
+ resource_class: large
+ environment:
+ KALEIDO_ARCH: "arm64"
+ steps:
+ - mac_build:
+ arch: "arm64"
+
 
  windows_fetch:
  executor:
@@ -213,6 +289,7 @@ jobs:
  - .gclient
  - .gclient_entries
  - kaleido/version
+ - CREDITS.html
 
  windows_build_x64:
  executor:
@@ -250,16 +327,27 @@ workflows:
  - windows_build_x86:
  requires:
  - windows_fetch
- build-mac:
+
+ build-mac-x64:
  jobs:
  - mac_fetch
- - mac_build_blink:
+ - mac_build_blink_x64:
  requires:
  - mac_fetch
- - mac_build:
+ - mac_build_x64:
  requires:
- - mac_build_blink
+ - mac_build_blink_x64
 
+ build-mac-arm64:
+ jobs:
+ - mac_fetch
+ - mac_build_blink_arm64:
+ requires:
+ - mac_fetch
+ - mac_build_arm64:
+ requires:
+ - mac_build_blink_arm64
+
  build-linux-x64:
  jobs:
  - linux_fetch

.gitignore

@@ -1,3 +1,4 @@
+repos/CREDITS.html
 repos/src
 repos/depot_tools
 *.DS_Store
@@ -27,3 +28,4 @@ repos/kaleido/py/dist/
 *.egg-info/
 repos/kaleido/py/scratch/
 .idea/
+repos/CREDITS.html