Skip to content

Commit

Permalink
Merge pull request #8042 from madhavajay/madhava/colima-fix
Browse files Browse the repository at this point in the history
Fixed issue with colima on mac runners
  • Loading branch information
madhavajay authored Aug 28, 2023
2 parents b83f550 + bddf661 commit df0d070
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/pr-tests-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ jobs:
restore-keys: |
${{ runner.os }}-pip-py${{ matrix.python-version }}-
- name: Fix Colima issue on MacOS Runners
if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]
Expand Down Expand Up @@ -144,6 +152,14 @@ jobs:
curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x ~/.docker/cli-plugins/docker-compose
- name: Fix Colima issue on MacOS Runners
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/pr-tests-stack-public.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ jobs:
curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x ~/.docker/cli-plugins/docker-compose
- name: Fix Colima issue on MacOS Runners
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/pr-tests-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@ jobs:
curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x ~/.docker/cli-plugins/docker-compose
- name: Fix Colima issue on MacOS Runners
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]
Expand Down Expand Up @@ -340,6 +348,14 @@ jobs:
curl -sSL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
chmod +x ~/.docker/cli-plugins/docker-compose
- name: Fix Colima issue on MacOS Runners
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/pr-tests-syft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,14 @@ jobs:
pip install --upgrade tox packaging wheel --default-timeout=60
python -c "import platform; import os; os.system('pip install jaxlib==0.4.10 -f https://whls.blob.core.windows.net/unstable/index.html') if platform.system().lower() == 'windows' else ''"
- name: Fix Colima issue on MacOS Runners
if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-13'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-13'
uses: crazy-max/[email protected]
Expand Down Expand Up @@ -253,6 +261,14 @@ jobs:
chmod +x ~/.docker/cli-plugins/docker-compose
docker compose version
- name: Fix Colima issue on MacOS Runners
if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'macos-latest'
shell: bash
run: |
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
brew update
brew reinstall qemu
- name: Docker on MacOS
if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'macos-latest'
uses: crazy-max/[email protected]
Expand Down

0 comments on commit df0d070

Please sign in to comment.