Skip to content

Commit a12de69

Browse files
trop[bot]codebytere
authored andcommitted
ci: add macOS debug builds (electron#20572)
* ci: add macOS debug builds * Fix mac debug builds * Remove ninja status as it is not available in 6-0-x
1 parent e257981 commit a12de69

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

.circleci/config.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,9 +640,11 @@ steps-electron-build-for-tests: &steps-electron-build-for-tests
640640
- *step-depot-tools-add-to-path
641641
- *step-setup-env-for-build
642642
- *step-restore-brew-cache
643+
- *step-get-more-space-on-mac
643644
- *step-install-npm-deps-on-mac
644645
- *step-fix-sync-on-mac
645646
- *step-gn-gen-default
647+
- *step-delete-git-directories
646648

647649
# Electron app
648650
- *step-electron-build
@@ -1099,6 +1101,14 @@ jobs:
10991101
<<: *env-enable-sccache
11001102
<<: *steps-electron-build-for-tests
11011103

1104+
osx-debug:
1105+
<<: *machine-mac-large
1106+
environment:
1107+
<<: *env-mac-large
1108+
<<: *env-debug-build
1109+
<<: *env-enable-sccache
1110+
<<: *steps-electron-build-for-tests
1111+
11021112
osx-debug-gn-check:
11031113
<<: *machine-mac
11041114
environment:
@@ -1147,6 +1157,15 @@ jobs:
11471157
<<: *env-enable-sccache
11481158
<<: *steps-electron-build-for-tests
11491159

1160+
mas-debug:
1161+
<<: *machine-mac-large
1162+
environment:
1163+
<<: *env-mac-large
1164+
<<: *env-mas
1165+
<<: *env-debug-build
1166+
<<: *env-enable-sccache
1167+
<<: *steps-electron-build-for-tests
1168+
11501169
mas-debug-gn-check:
11511170
<<: *machine-mac
11521171
environment:
@@ -1470,9 +1489,14 @@ workflows:
14701489
requires:
14711490
- mac-checkout
14721491

1492+
- osx-debug:
1493+
requires:
1494+
- mac-checkout
1495+
14731496
- osx-debug-gn-check:
14741497
requires:
14751498
- mac-checkout
1499+
14761500
- osx-testing-gn-check:
14771501
requires:
14781502
- mac-checkout
@@ -1485,9 +1509,14 @@ workflows:
14851509
requires:
14861510
- mac-checkout
14871511

1512+
- mas-debug:
1513+
requires:
1514+
- mac-checkout
1515+
14881516
- mas-debug-gn-check:
14891517
requires:
14901518
- mac-checkout
1519+
14911520
- mas-testing-gn-check:
14921521
requires:
14931522
- mac-checkout

BUILD.gn

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -657,9 +657,7 @@ static_library("electron_lib") {
657657
}
658658

659659
if (enable_desktop_capturer) {
660-
if (is_component_build && is_win) {
661-
# On windows the implementation relies on unexported
662-
# DxgiDuplicatorController class.
660+
if (is_component_build && !is_linux) {
663661
deps += [ "//third_party/webrtc/modules/desktop_capture" ]
664662
}
665663
sources += [

0 commit comments

Comments
 (0)