From 4e149608e9252a89af99810d2c28ff5125336ce5 Mon Sep 17 00:00:00 2001 From: Dmitrii Pichulin Date: Fri, 23 Feb 2018 22:03:46 +0300 Subject: [PATCH] chromium 64.0.3282.186 --- build_linux/chromium-gost-env.sh | 2 +- build_linux/chromium-gost-prepare.sh | 3 ++- build_windows/chromium-gost-env.bat | 2 +- build_windows/chromium-gost-prepare.bat | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build_linux/chromium-gost-env.sh b/build_linux/chromium-gost-env.sh index ed4569c..53ef595 100755 --- a/build_linux/chromium-gost-env.sh +++ b/build_linux/chromium-gost-env.sh @@ -1,4 +1,4 @@ -export CHROMIUM_TAG=64.0.3282.168 +export CHROMIUM_TAG=64.0.3282.186 export CHROMIUM_PATH=/c/chromium/src export BORINGSSL_PATH=$CHROMIUM_PATH/third_party/boringssl/src export DEPOT_TOOLS_PATH=/c/depot_tools/ diff --git a/build_linux/chromium-gost-prepare.sh b/build_linux/chromium-gost-prepare.sh index dc5fef1..12d9944 100755 --- a/build_linux/chromium-gost-prepare.sh +++ b/build_linux/chromium-gost-prepare.sh @@ -11,7 +11,8 @@ cd $BORINGSSL_PATH/.git || exit cd $BORINGSSL_PATH git reset HEAD~ --hard -cd $CHROMIUM_PATH || exit +cd $CHROMIUM_PATH +git reset HEAD~ --hard git fetch --tags git checkout -b $GOST_BRANCH tags/$CHROMIUM_TAG git checkout -f $GOST_BRANCH diff --git a/build_windows/chromium-gost-env.bat b/build_windows/chromium-gost-env.bat index f02b5ae..5d11eb8 100644 --- a/build_windows/chromium-gost-env.bat +++ b/build_windows/chromium-gost-env.bat @@ -1,4 +1,4 @@ -set CHROMIUM_TAG=64.0.3282.168 +set CHROMIUM_TAG=64.0.3282.186 set CHROMIUM_PATH=u:\chromium\src set BORINGSSL_PATH=%CHROMIUM_PATH%\third_party\boringssl\src set DEPOT_TOOLS_PATH=u:\depot_tools\ diff --git a/build_windows/chromium-gost-prepare.bat b/build_windows/chromium-gost-prepare.bat index f714edd..2cd045d 100644 --- a/build_windows/chromium-gost-prepare.bat +++ b/build_windows/chromium-gost-prepare.bat @@ -12,6 +12,7 @@ cd %BORINGSSL_PATH% call git reset HEAD~ --hard cd %CHROMIUM_PATH% +call git reset HEAD~ --hard call git fetch --tags call git checkout -b %GOST_BRANCH% tags/%CHROMIUM_TAG% call git checkout -f %GOST_BRANCH%