Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix chromium checkout (#10288)

Browse source 
Use `main` branch for all chromium-related projects.
This commit is contained in:
Andrey Lushnikov 2021-11-12 10:23:22 -08:00 committed by GitHub
parent b0723c0621
commit bc1ed831b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/chromium/build.sh
View file

@ -46,7 +46,7 @@ compile_chromium() {
# As of Jan, 2021 Chromium mac compilation requires Xcode12.2 # As of Jan, 2021 Chromium mac compilation requires Xcode12.2
selectXcodeVersionOrDie "12.2" selectXcodeVersionOrDie "12.2"
# As of Jan, 2021 Chromium mac compilation is only possible on Intel macbooks. # As of Jan, 2021 Chromium mac compilation is only possible on Intel macbooks.
# See https://chromium.googlesource.com/chromium/src.git/+/master/docs/mac_arm64.md # See https://chromium.googlesource.com/chromium/src.git/+/main/docs/mac_arm64.md
if [[ $1 == "--compile-mac-arm64" && $(uname -m) != "x86_64" ]]; then if [[ $1 == "--compile-mac-arm64" && $(uname -m) != "x86_64" ]]; then
echo "ERROR: chromium mac arm64 compilation is (ironically) only supported on Intel Macbooks" echo "ERROR: chromium mac arm64 compilation is (ironically) only supported on Intel Macbooks"
exit 1 exit 1

2
browser_patches/ffmpeg/build-linux.sh
View file

@ -51,7 +51,7 @@ function build_libvpx {
cd libvpx cd libvpx
git checkout "${LIBVPX_VERSION}" git checkout "${LIBVPX_VERSION}"
# Cross-compiling libvpx according to the docs: # Cross-compiling libvpx according to the docs:
# - https://chromium.googlesource.com/webm/libvpx/+/master/README # - https://chromium.googlesource.com/webm/libvpx/+/main/README
./configure --prefix="${PREFIX}" ${LIBVPX_CONFIG} ./configure --prefix="${PREFIX}" ${LIBVPX_CONFIG}
make && make install make && make install
} }

2
browser_patches/ffmpeg/build-mac.sh
View file

@ -57,7 +57,7 @@ function build_libvpx {
cd libvpx cd libvpx
git checkout "${LIBVPX_VERSION}" git checkout "${LIBVPX_VERSION}"
# Compile libvpx according to the docs: # Compile libvpx according to the docs:
# - https://chromium.googlesource.com/webm/libvpx/+/master/README # - https://chromium.googlesource.com/webm/libvpx/+/main/README
./configure --prefix="${PREFIX}" ${LIBVPX_CONFIG} ./configure --prefix="${PREFIX}" ${LIBVPX_CONFIG}
make && make install make && make install
} }

2
browser_patches/ffmpeg/crosscompile-from-linux.sh
View file

@ -78,7 +78,7 @@ function build_libvpx {
cd libvpx cd libvpx
git checkout "${LIBVPX_VERSION}" git checkout "${LIBVPX_VERSION}"
# Cross-compiling libvpx according to the docs: # Cross-compiling libvpx according to the docs:
# - https://chromium.googlesource.com/webm/libvpx/+/master/README # - https://chromium.googlesource.com/webm/libvpx/+/main/README
local target="" local target=""
if [[ $arch == "win64" ]]; then if [[ $arch == "win64" ]]; then
target="x86_64-win64-gcc"; target="x86_64-win64-gcc";

6
browser_patches/prepare_checkout.sh
View file

@ -44,7 +44,7 @@ function prepare_chromium_checkout {
# Update Chromium checkout. # Update Chromium checkout.
# #
# This is based on https://chromium.googlesource.com/chromium/src/+/master/docs/linux/build_instructions.md#get-the-code # This is based on https://chromium.googlesource.com/chromium/src/+/main/docs/linux/build_instructions.md#get-the-code
if [[ ! -d "${CR_CHECKOUT_PATH}" ]]; then if [[ ! -d "${CR_CHECKOUT_PATH}" ]]; then
rm -rf "${CR_CHECKOUT_PATH}" rm -rf "${CR_CHECKOUT_PATH}"
mkdir -p "${CR_CHECKOUT_PATH}" mkdir -p "${CR_CHECKOUT_PATH}"
@ -62,8 +62,8 @@ function prepare_chromium_checkout {
fi fi
cd "${CR_CHECKOUT_PATH}/src" cd "${CR_CHECKOUT_PATH}/src"
git checkout master git checkout main
git pull origin master git pull origin main
git checkout "${CRSHA}" git checkout "${CRSHA}"
gclient sync -D gclient sync -D
} }