update text "2.20.1 -> 2.25.1"

.github/workflows/build_bromite_dev.yaml

@@ -81,7 +81,7 @@ jobs:
           
           cd bromite-buildtools
           
-      - name: Checking build-deps for ${{ env.VERSION }}
+      - name: Building build-deps container ${{ env.VERSION }}
         shell: bash
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$VERSION > /dev/null ; echo $?)
@@ -97,7 +97,7 @@ jobs:
             fi
           fi
         
-      - name: Checking chromium for ${{ env.VERSION }}
+      - name: Building chromium container ${{ env.VERSION }}
         shell: bash
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/chromium:$VERSION > /dev/null ; echo $?)
@@ -112,7 +112,7 @@ jobs:
             fi
           fi
 
-      - name: Checking bromite for ${{ env.BROMITE_SHA }}
+      - name: Building bromite container ${{ env.BROMITE_SHA }}
         shell: bash
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/bromite:$BROMITE_SHA > /dev/null ; echo $?)
@@ -127,7 +127,7 @@ jobs:
             fi
           fi
           
-      - name: Checking bromite-build for ${{ env.BROMITE_SHA }}
+      - name: Building bromite-build container ${{ env.BROMITE_SHA }}
         shell: bash
         run: |
           IS_PRESENT=$(docker inspect --type=image uazo/bromite-build:$BROMITE_SHA > /dev/null ; echo $?)

apply-single-patch.sh

@@ -70,12 +70,11 @@ if [[ DOBUILD -eq 1 ]]; then
 
         DOEXPORT=1
 
-fi
-
-if [[ OK -eq 0 ]]; then
-        if [ -z "$SILENT" ]; then
-           echo "Read to add $PATCH. Press return"
-           read  -n 1
+        if [[ OK -eq 1 ]]; then
+                if [ -z "$SILENT" ]; then
+                   echo "Read to add $PATCH. Press return"
+                   read  -n 1
+                fi
         fi
 fi
 

export-single-patch.sh

@@ -33,7 +33,7 @@ sed -i '/^old mode /d' ~/bromite/build/patches-new/$PATCH_FILE
 sed -i '/^new mode /d' ~/bromite/build/patches-new/$PATCH_FILE
 
 echo "-- " >> ~/bromite/build/patches-new/$PATCH_FILE
-echo "2.20.1" >> ~/bromite/build/patches-new/$PATCH_FILE
+echo "2.25.1" >> ~/bromite/build/patches-new/$PATCH_FILE
 echo "" >> ~/bromite/build/patches-new/$PATCH_FILE
 
 echo "   done."

images/bromite-build/pre-start.sh

@@ -34,8 +34,8 @@ vpython -vpython-spec .vpython -vpython-root $VPYTHON_VIRTUALENV_ROOT -vpython-l
 vpython3 -vpython-spec .vpython3 -vpython-root $VPYTHON_VIRTUALENV_ROOT -vpython-log-level debug -vpython-tool install
 
 echo -e ${RED} -------- download x86_64 android image ${NC}
-echo -e "\$ParanoidMode CheckIntegrity\n\nchromium/third_party/android_sdk/public/avds/android-31/google_apis/x86_64 Ur_zl6_BRKRkf_9X3SMZ3eH2auoOyJ2kLslpTZZwi3gC" | .cipd_client ensure -ensure-file - -root $WORKSPACE/chromium/src/.android
-echo -e "\$ParanoidMode CheckIntegrity\n\nchromium/third_party/android_sdk/public/emulator gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC\nchromium/third_party/android_sdk/public/system-images/android-31/google_apis/x86_64 R6Jh5_P21Euu-kdb11zcNjdJKN4vV1mdQTb8t4gph4IC" | .cipd_client ensure -ensure-file - -root $WORKSPACE/chromium/src/.emulator_sdk
+#echo -e "\$ParanoidMode CheckIntegrity\n\nchromium/third_party/android_sdk/public/avds/android-31/google_apis/x86_64 Ur_zl6_BRKRkf_9X3SMZ3eH2auoOyJ2kLslpTZZwi3gC" | .cipd_client ensure -ensure-file - -root $WORKSPACE/chromium/src/.android
+#echo -e "\$ParanoidMode CheckIntegrity\n\nchromium/third_party/android_sdk/public/emulator gMHhUuoQRKfxr-MBn3fNNXZtkAVXtOwMwT7kfx8jkIgC\nchromium/third_party/android_sdk/public/system-images/android-31/google_apis/x86_64 R6Jh5_P21Euu-kdb11zcNjdJKN4vV1mdQTb8t4gph4IC" | .cipd_client ensure -ensure-file - -root $WORKSPACE/chromium/src/.emulator_sdk
 
 echo -e ${RED} -------- download kythe resources ${NC}
 wget https://chromium.googlesource.com/chromium/tools/build/+/main/recipes/recipe_modules/codesearch/resources/add_kythe_metadata.py?format=TEXT -O ~/add_kythe_metadata.py.base64