mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #14575 from electron/do-not-use-libcc-in-ci-scripts

Browse source 
ci: do not use scripts and binaries from the libcc repo
This commit is contained in:
John Kleinschmidt 2018-09-12 12:23:49 -04:00 committed by GitHub
commit 1682170d3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.circleci/config.yml
View file

@ -169,7 +169,7 @@ mac-build-steps: &mac-build-steps
name: GN gen name: GN gen
command: | command: |
cd src cd src
SCCACHE_PATH="$PWD/libchromiumcontent/tools/sccache/aad2120/mac/sccache" SCCACHE_PATH="$PWD/electron/external_binaries/sccache"
echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV echo 'export SCCACHE_WRAPPER="'"$SCCACHE_PATH"'"' >> $BASH_ENV
echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/buildtools"' >> $BASH_ENV
source $BASH_ENV source $BASH_ENV

16
vsts-gn.yml
View file

@ -31,13 +31,13 @@ phases:
- bash: | - bash: |
cd src cd src
export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
export SCCACHE_WRAPPER="`pwd`/electron/external_binaries/sccache" export SCCACHE_BINARY="`pwd`/electron/external_binaries/sccache"
export SCCACHE_HELPER="`pwd`/libchromiumcontent/script/sccache" # SCCACHE_AZURE_BLOB_CONTAINER and SCCACHE_AZURE_CONNECTION_STRING are expected to be set.
"$SCCACHE_HELPER" --start-server --azure_container "$(SCCACHE_AZURE_BLOB_CONTAINER)" --azure_connection "$(SCCACHE_AZURE_CONNECTION_STRING)" "$SCCACHE_BINARY" --start-server
echo "##vso[task.setvariable variable=SCCACHE_WRAPPER]$SCCACHE_WRAPPER" echo "##vso[task.setvariable variable=SCCACHE_BINARY]$SCCACHE_BINARY"
echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]`pwd`/buildtools" echo "##vso[task.setvariable variable=CHROMIUM_BUILDTOOLS_PATH]$CHROMIUM_BUILDTOOLS_PATH"
echo "GN gen for: $GN_CONFIG" echo "GN gen for: $GN_CONFIG"
gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_WRAPPER"'"' gn gen out/Default --args='import("'$GN_CONFIG'") cc_wrapper="'"$SCCACHE_BINARY"'"'
name: GN_gen name: GN_gen
- bash: | - bash: |
@ -46,8 +46,8 @@ phases:
name: Ninja_build name: Ninja_build
- bash: | - bash: |
"$SCCACHE_WRAPPER" -s "$SCCACHE_BINARY" -s
"$SCCACHE_WRAPPER" --stop-server "$SCCACHE_BINARY" --stop-server
name: Check_sccache_stats name: Check_sccache_stats
- bash: | - bash: |