Skip to content

Commit

Permalink
Removes custom docker+osx matrix for rust (#190)
Browse files Browse the repository at this point in the history
This removes the custom script for rust at expense of longer runtimes,
last checked at 1hr for the e2e.

Fixes #145

Signed-off-by: Adrian Cole <adrian@tetrate.io>
  • Loading branch information
codefromthecrypt authored Apr 21, 2021
1 parent 46fc4c1 commit 94782f1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 63 deletions.
11 changes: 1 addition & 10 deletions .github/workflows/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 1 addition & 10 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
43 changes: 0 additions & 43 deletions ci/e2e/darwin/install_docker.sh

This file was deleted.

0 comments on commit 94782f1

Please sign in to comment.