Remove gsutil

Author: pcastornii

.github/workflows/snapshot-deploy.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy
+name: Snapshot Deploy
 
 on:
   push:
@@ -115,9 +115,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Fix gsutil dependency
-        run: pip install six
-
       - name: Build native code (macOS arm64)
         run: |
           cd native && mkdir build && cd build
@@ -169,9 +166,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Fix gsutil dependency
-        run: pip install six
-
       - name: Build native code (Windows)
         run: |
           cd native

native/CMakeLists.txt

@@ -259,42 +259,41 @@ endif()
 # make_readme.py script.
 file(COPY "${CEF_ROOT}/README.txt" DESTINATION "${CMAKE_BINARY_DIR}")
 
-# Download clang-format from Google Storage.
+# Download clang-format directly from Google Storage.
 if(OS_WINDOWS)
-  set(GS_PLATFORM "win32")
-  set(GS_HASHPATH "win/clang-format.exe.sha1")
-  set(GS_OUTPATH "win/clang-format.exe")
+  set(CF_HASHFILE "tools/buildtools/win/clang-format.exe.sha1")
+  set(CF_OUTPATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/buildtools/win/clang-format.exe")
 elseif(OS_MACOSX)
-  set(GS_PLATFORM "darwin")
   if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
-    set(GS_HASHPATH "mac/clang-format.arm64.sha1")
+    set(CF_HASHFILE "tools/buildtools/mac/clang-format.arm64.sha1")
   else()
-    set(GS_HASHPATH "mac/clang-format.x64.sha1")
+    set(CF_HASHFILE "tools/buildtools/mac/clang-format.x64.sha1")
   endif()
-  set(GS_OUTPATH "mac/clang-format")
+  set(CF_OUTPATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/buildtools/mac/clang-format")
 elseif(OS_LINUX)
-  set(GS_PLATFORM "linux*")
-  set(GS_HASHPATH "linux64/clang-format.sha1")
-  set(GS_OUTPATH "linux64/clang-format")
+  set(CF_HASHFILE "tools/buildtools/linux64/clang-format.sha1")
+  set(CF_OUTPATH "${CMAKE_CURRENT_SOURCE_DIR}/tools/buildtools/linux64/clang-format")
 endif()
 
 message(STATUS "Downloading clang-format from Google Storage...")
-execute_process(
-  COMMAND "${PYTHON_EXECUTABLE}"
-          "tools/buildtools/download_from_google_storage.py"
-          "--no_resume"
-          "--platform=${GS_PLATFORM}"
-          "--no_auth"
-          "--bucket" "chromium-clang-format"
-          "-s" "tools/buildtools/${GS_HASHPATH}"
-          "-o" "tools/buildtools/${GS_OUTPATH}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  RESULT_VARIABLE EXECUTE_RV
-  )
-if(NOT EXECUTE_RV STREQUAL "0")
-  message(FATAL_ERROR "Execution failed with unexpected result: ${EXECUTE_RV}")
+file(READ "${CMAKE_CURRENT_SOURCE_DIR}/${CF_HASHFILE}" CF_HASH)
+string(STRIP "${CF_HASH}" CF_HASH)
+file(DOWNLOAD
+  "https://storage.googleapis.com/chromium-clang-format/${CF_HASH}"
+  "${CF_OUTPATH}"
+  STATUS DOWNLOAD_STATUS
+  SHOW_PROGRESS
+)
+list(GET DOWNLOAD_STATUS 0 DOWNLOAD_STATUS_CODE)
+if(NOT DOWNLOAD_STATUS_CODE EQUAL 0)
+  message(FATAL_ERROR "Failed to download clang-format: ${DOWNLOAD_STATUS}")
+endif()
+if(NOT OS_WINDOWS)
+  file(CHMOD "${CF_OUTPATH}" PERMISSIONS
+    OWNER_READ OWNER_WRITE OWNER_EXECUTE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE)
 endif()
-
 
 #
 # Include target subdirectories.