diff --git a/.github/workflows/commit.yaml b/.github/workflows/commit.yaml index c895a062..3225fa11 100644 --- a/.github/workflows/commit.yaml +++ b/.github/workflows/commit.yaml @@ -135,20 +135,11 @@ jobs: - name: "Install 'Docker for Mac' (Latest)" uses: docker-practice/actions-setup-docker@v1 - if: runner.os == 'macOS' && matrix.args.extension-language == 'tinygo' + if: runner.os == 'macOS' with: docker_buildx: false # Install is flakey. When it, we can install it via docker/setup-buildx-action@v1 timeout-minutes: 20 # fail fast if MacOS install takes too long - - name: "Install 'Docker for Mac' (2.0.0.3 2019-02-15)" # Avoid >1hr tests on macOS+rust. See issue #145 - if: runner.os == 'macOS' && matrix.args.extension-language == 'rust' - # don't use `DOCKER_BUILDKIT=1`, `--build-arg BUILDKIT_INLINE_CACHE=1` and `--cache-from` - # options when using this version of `Docker for Mac` - run: | - ./ci/e2e/darwin/install_docker.sh - echo "USE_DOCKER_BUILDKIT_CACHE=no" >> $GITHUB_ENV - timeout-minutes: 20 # fail fast if MacOS install takes too long - - name: "Build language-specific Docker build images" run: make builders timeout-minutes: 20 # NOTE: the rust image is very large and can alone take 7 minutes to download and build diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index edff87c1..a73bf0fb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -122,20 +122,11 @@ jobs: - name: "Install 'Docker for Mac' (Latest)" uses: docker-practice/actions-setup-docker@v1 - if: runner.os == 'macOS' && matrix.args.extension-language == 'tinygo' + if: runner.os == 'macOS' with: docker_buildx: false # Install is flakey. When it, we can install it via docker/setup-buildx-action@v1 timeout-minutes: 20 # fail fast if MacOS install takes too long - - name: "Install 'Docker for Mac' (2.0.0.3 2019-02-15)" # Avoid >1hr tests on macOS+rust. See issue #145 - if: runner.os == 'macOS' && matrix.args.extension-language == 'rust' - # don't use `DOCKER_BUILDKIT=1`, `--build-arg BUILDKIT_INLINE_CACHE=1` and `--cache-from` - # options when using this version of `Docker for Mac` - run: | - ./ci/e2e/darwin/install_docker.sh - echo "USE_DOCKER_BUILDKIT_CACHE=no" >> $GITHUB_ENV - timeout-minutes: 20 # fail fast if MacOS install takes too long - - name: "Pull extension builder images" # pull Docker images in advance to make output of # `getenvoy extension build | test | run` stable diff --git a/ci/e2e/darwin/install_docker.sh b/ci/e2e/darwin/install_docker.sh deleted file mode 100755 index f2c7f6c7..00000000 --- a/ci/e2e/darwin/install_docker.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2020 Tetrate -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -e - -TMP_DIR=$(mktemp -d) - -# Docker for Mac 2.0.0.3-ce-mac81,31259 (the last version of 'Docker for Mac' that can be installed in CI environment) -E2E_MACOS_DOCKER_CASK_VERSION="${E2E_MACOS_DOCKER_CASK_VERSION:-8ce4e89d10716666743b28c5a46cd54af59a9cc2}" - -# install Docker for Mac -pushd "${TMP_DIR}" -curl -L https://raw.githubusercontent.com/Homebrew/homebrew-cask/${E2E_MACOS_DOCKER_CASK_VERSION}/Casks/docker.rb > docker.rb -brew install --cask docker.rb -popd - -# follow instructions from: -# https://github.com/microsoft/azure-pipelines-image-generation/issues/738#issuecomment-496211237 -# https://github.com/microsoft/azure-pipelines-image-generation/issues/738#issuecomment-522301481 -sudo /Applications/Docker.app/Contents/MacOS/Docker --quit-after-install --unattended -nohup /Applications/Docker.app/Contents/MacOS/Docker --unattended > /dev/stdout & -while ! docker info 2> /dev/null; do - sleep 5 - echo "Waiting for docker service to be in the running state. \ - If Docker is not ready within 10 minutes, it's better to fail the current CI Job and let the comitter to re-start the job manually" -done - -# Verify install without using docker.io as it is rate-limited -# .github/workflows/internal-images.yml publishes this -docker run --rm ghcr.io/tetratelabs/getenvoy-internal:busybox date