|
16 | 16 | GN_BUILD_TYPE:
|
17 | 17 | required: false
|
18 | 18 | type: string
|
19 |
| - default: testing |
| 19 | + default: release |
20 | 20 | GENERATE_SYMBOLS:
|
21 | 21 | required: false
|
22 | 22 | type: boolean
|
|
36 | 36 | AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
|
37 | 37 | AZURE_STORAGE_CONTAINER_NAME: ${{ secrets.AZURE_STORAGE_CONTAINER_NAME }}
|
38 | 38 | ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
|
| 39 | + GN_CONFIG: ${{ inputs.GN_CONFIG }} |
39 | 40 | # Disable pre-compiled headers to reduce out size - only useful for rebuilds
|
40 | 41 | GN_BUILDFLAG_ARGS: 'enable_precompiled_headers = false'
|
41 | 42 | GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
|
@@ -200,7 +201,8 @@ jobs:
|
200 | 201 | run: |
|
201 | 202 | export BUILD_TOOLS_SHA=2bb63e2e7877491b52f972532b52adc979a6ec2f
|
202 | 203 | npm i -g @electron/build-tools
|
203 |
| - e init --root=$(pwd) --out=Default ${{ inputs.GN_BUILD_TYPE }} |
| 204 | + e init --root=$(pwd) --out=Default ${{ inputs.GN_BUILD_TYPE }} --import ${{ inputs.GN_BUILD_TYPE }} |
| 205 | + e use ${{ inputs.GN_BUILD_TYPE }} |
204 | 206 | - name: Checkout Electron
|
205 | 207 | uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
|
206 | 208 | with:
|
@@ -335,7 +337,11 @@ jobs:
|
335 | 337 | cipd ensure --root src/buildtools/reclient -ensure-file gn_ensure_file
|
336 | 338 | python3 src/buildtools/reclient_cfgs/configure_reclient_cfgs.py --rbe_instance "projects/rbe-chrome-untrusted/instances/default_instance" --reproxy_cfg_template reproxy.cfg.template --rewrapper_cfg_project "" --skip_remoteexec_cfg_fetch
|
337 | 339 |
|
338 |
| - DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1 |
| 340 | + if [ "$TARGET_ARCH" == "arm64" ]; then |
| 341 | + DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1 |
| 342 | + else |
| 343 | + DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.x64.sha1 |
| 344 | + fi |
339 | 345 | python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil
|
340 | 346 |
|
341 | 347 | echo 'infra/3pp/tools/ninja/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/tools/ninja/${platform}'` > ninja_ensure_file
|
@@ -454,9 +460,9 @@ jobs:
|
454 | 460 | # TODO(codebytere): remove this once we figure out why .git/packed-refs is initially missing
|
455 | 461 | git pack-refs
|
456 | 462 | cd ..
|
457 |
| -
|
458 | 463 | ulimit -n 10000
|
459 | 464 | sudo launchctl limit maxfiles 65536 200000
|
| 465 | +
|
460 | 466 | NINJA_SUMMARIZE_BUILD=1 e build -j $NUMBER_OF_NINJA_PROCESSES
|
461 | 467 | cp out/Default/.ninja_log out/electron_ninja_log
|
462 | 468 | node electron/script/check-symlinks.js
|
@@ -548,7 +554,7 @@ jobs:
|
548 | 554 | key: ${{ runner.os }}-build-artifacts-darwin-${{ env.TARGET_ARCH }}-${{ github.sha }}
|
549 | 555 | - name: Create MAS Config
|
550 | 556 | run: |
|
551 |
| - mv src/electron/.github/workflows/config/evm.mas.json $HOME/.electron_build_tools/configs/evm.mas.json |
| 557 | + mv src/electron/.github/workflows/config/${{ inputs.GN_BUILD_TYPE }}/evm.mas.json $HOME/.electron_build_tools/configs/evm.mas.json |
552 | 558 | echo "MAS_BUILD=true" >> $GITHUB_ENV
|
553 | 559 | e use mas
|
554 | 560 | - name: Build Electron (mas)
|
@@ -718,7 +724,8 @@ jobs:
|
718 | 724 | steps:
|
719 | 725 | - name: Load Build Tools
|
720 | 726 | run: |
|
721 |
| - yarn add git://github.com/electron/build-tools.git#2bb63e2e7877491b52f972532b52adc979a6ec2f |
| 727 | + export BUILD_TOOLS_SHA=2bb63e2e7877491b52f972532b52adc979a6ec2f |
| 728 | + npm i -g @electron/build-tools |
722 | 729 | e init --root=$(pwd) --out=Default ${{ inputs.GN_BUILD_TYPE }}
|
723 | 730 | - name: Checkout Electron
|
724 | 731 | uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
|
|
0 commit comments