ci: Dont setup docker on macos (#36329)

Signed-off-by: Ryan Northey <[email protected]>
envoyproxy · Sep 25, 2024 · c33935e · c33935e
1 parent 039ac1d
commit c33935e
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 1 deletion.
diff --git a/.github/workflows/_mobile_container_ci.yml b/.github/workflows/_mobile_container_ci.yml
@@ -141,6 +141,7 @@ jobs:
       container-output: ${{ inputs.container-output }}
       command: ${{ inputs.command }}
       concurrency-suffix: ${{ inputs.concurrency-suffix }}
+      docker-ipv6: false
       entrypoint: ${{ inputs.entrypoint || inputs.entrypoint-DEFAULT }}
       downloads: ${{ inputs.downloads }}
       error-match: ${{ inputs.error-match }}

diff --git a/.github/workflows/_run.yml b/.github/workflows/_run.yml
@@ -1,4 +1,4 @@
-name: Envoy CI
+11;rgb:fdfd/f6f6/e3e3name: Envoy CI
 
 permissions:
   contents: read
@@ -53,6 +53,9 @@ on:
       diskspace-hack-paths:
         type: string
         default:
+      docker-ipv6:
+        default: true
+        type: boolean
       downloads:
         type: string
       entrypoint:
@@ -259,6 +262,7 @@ jobs:
           "fixed-cidr-v6": "2001:db8:1::/64"
           }' | sudo tee /etc/docker/daemon.json
         sudo service docker restart
+      if: ${{ inputs.docker-ipv6 }}
 
     - run: |
         echo "e3b4a6e9570da15ac1caffdded17a8bebdc7dfc9" > .BAZEL_FAKE_SCM_REVISION

diff --git a/.github/workflows/envoy-macos.yml b/.github/workflows/envoy-macos.yml
@@ -45,6 +45,7 @@ jobs:
     with:
       command:
       container-command:
+      docker-ipv6: false
       request: ${{ needs.load.outputs.request }}
       runs-on: macos-14-xlarge
       source: ${{ matrix.source }}

diff --git a/.github/workflows/mobile-android_build.yml b/.github/workflows/mobile-android_build.yml
@@ -64,6 +64,7 @@ jobs:
     with:
       command: ./bazelw
       container-command:
+      docker-ipv6: false
       # Return to using:
       #   ./bazelw mobile-install --fat_apk_cpu=x86_64 --start_app //examples/kotlin/hello_world:hello_envoy_kt
       # When https://github.com/envoyproxy/envoy-mobile/issues/853 is fixed.

diff --git a/.github/workflows/mobile-docs.yml b/.github/workflows/mobile-docs.yml
@@ -53,6 +53,7 @@ jobs:
         path: mobile-docs
         fetch-depth: 0
         branch: master
+      docker-ipv6: false
       source: |
         echo "ENVOY_DOCKER_SOURCE_DIR=/source/mobile" >> $GITHUB_ENV
         # Path relative to ./mobile directory

diff --git a/.github/workflows/mobile-ios_build.yml b/.github/workflows/mobile-ios_build.yml
@@ -41,6 +41,7 @@ jobs:
       args: ${{ matrix.args }}
       command: ./bazelw
       container-command:
+      docker-ipv6: false
       request: ${{ needs.load.outputs.request }}
       runs-on: macos-12-large
       source: |
@@ -80,6 +81,7 @@ jobs:
         ${{ matrix.app }}
       command: ./bazelw
       container-command:
+      docker-ipv6: false
       request: ${{ needs.load.outputs.request }}
       runs-on: macos-12-large
       source: |
@@ -125,6 +127,7 @@ jobs:
         ${{ matrix.app }}
       command: ./bazelw
       container-command:
+      docker-ipv6: false
       request: ${{ needs.load.outputs.request }}
       runs-on: macos-12-large
       source: |

diff --git a/.github/workflows/mobile-ios_tests.yml b/.github/workflows/mobile-ios_tests.yml
@@ -41,6 +41,7 @@ jobs:
       args: ${{ matrix.args }}
       command: ./bazelw
       container-command:
+      docker-ipv6: false
       request: ${{ needs.load.outputs.request }}
       runs-on: macos-12
       source: |

diff --git a/.github/workflows/mobile-release_validation.yml b/.github/workflows/mobile-release_validation.yml
@@ -48,6 +48,7 @@ jobs:
         //:ios_xcframework
       command: ./bazelw
       container-command:
+      docker-ipv6: false
       request: ${{ needs.load.outputs.request }}
       runs-on: macos-12
       source: |