build: remove the CIPD patch from depot tools (electron#42484)

* build: try to remove the CIPD patch from depot tools

* build: remove cipd patch from GHA

.circleci/config/base.yml

@@ -253,25 +253,6 @@ step-depot-tools-get: &step-depot-tools-get
         sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
       else
         sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-        cd depot_tools
-        cat > gclient.diff \<< 'EOF'
-      diff --git a/gclient.py b/gclient.py
-      index c305c248..e6e0fbdc 100755
-      --- a/gclient.py
-      +++ b/gclient.py
-      @@ -783,7 +783,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
-                               not condition or "non_git_source" not in condition):
-                           continue
-                       cipd_root = self.GetCipdRoot()
-      -                for package in dep_value.get('packages', []):
-      +                packages = dep_value.get('packages', [])
-      +                for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
-                           deps_to_add.append(
-                               CipdDependency(parent=self,
-                                              name=name,
-      EOF
-        git apply --3way gclient.diff
       fi
       # Ensure depot_tools does not update.
       test -d depot_tools && cd depot_tools

.github/actions/checkout/action.yml

@@ -21,12 +21,7 @@ runs:
     shell: bash
     run: |
       git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-
       sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-      # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-      cd depot_tools
-      git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-
       # Ensure depot_tools does not update.
       test -d depot_tools && cd depot_tools
       touch .disable_auto_update

.github/workflows/pipeline-segment-electron-build.yml

@@ -115,9 +115,6 @@ jobs:
 
         # Ensure depot_tools does not update.
         test -d depot_tools && cd depot_tools
-        if [ "`uname`" = "Linux" ]; then
-          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
-        fi
         touch .disable_auto_update
     - name: Add Depot Tools to PATH
       run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH

.github/workflows/pipeline-segment-electron-test.yml

@@ -70,9 +70,6 @@ jobs:
           sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
         else
           sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-          # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-          cd depot_tools
-          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
         fi
         # Ensure depot_tools does not update.
         test -d depot_tools && cd depot_tools

.github/workflows/pipeline-segment-node-nan-test.yml

@@ -65,8 +65,6 @@ jobs:
       run: |
         git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
         sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
         # Ensure depot_tools does not update.
         test -d depot_tools && cd depot_tools
         touch .disable_auto_update
@@ -126,8 +124,6 @@ jobs:
       run: |
         git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
         sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
         # Ensure depot_tools does not update.
         test -d depot_tools && cd depot_tools
         touch .disable_auto_update