Skip to content

Commit

Permalink
build: ensure angle has a full git checkout available to it
Browse files Browse the repository at this point in the history
  • Loading branch information
MarshallOfSound committed Nov 16, 2021
1 parent cf00f6b commit ea6087e
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -447,16 +447,20 @@ step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac
# This step handles the differences between the linux "gclient sync"
# and the expected state on macOS
step-fix-sync-on-mac: &step-fix-sync-on-mac
step-fix-sync: &step-fix-sync
run:
name: Fix Sync on macOS
name: Fix Sync
command: |
if [ "`uname`" == "Darwin" ]; then
# Fix Clang Install (wrong binary)
rm -rf src/third_party/llvm-build
python3 src/tools/clang/scripts/update.py
fi
cd src/third_party/angle
git remote set-url origin https://chromium.googlesource.com/angle/angle.git
git fetch
step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
run:
name: Import and trust self-signed codesigning cert on MacOS
Expand Down Expand Up @@ -1118,7 +1122,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
- *step-setup-goma-for-build
- *step-get-more-space-on-mac
- *step-install-npm-deps-on-mac
- *step-fix-sync-on-mac
- *step-fix-sync
- *step-gn-gen-default

#Compile ts/js to verify doc change didn't break anything
Expand Down Expand Up @@ -1473,7 +1477,7 @@ commands:
- *step-setup-env-for-build
- *step-setup-goma-for-build
- *step-get-more-space-on-mac
- *step-fix-sync-on-mac
- *step-fix-sync
- *step-delete-git-directories

# Electron app
Expand Down Expand Up @@ -1577,7 +1581,7 @@ commands:
- *step-gclient-sync
- *step-delete-git-directories
- *step-minimize-workspace-size-from-checkout
- *step-fix-sync-on-mac
- *step-fix-sync
- *step-setup-env-for-build
- *step-setup-goma-for-build
- *step-gn-gen-default
Expand Down

0 comments on commit ea6087e

Please sign in to comment.