diff --git a/.github/workflows/pr-tests-frontend.yml b/.github/workflows/pr-tests-frontend.yml index beca4a856d4..293c1179dd0 100644 --- a/.github/workflows/pr-tests-frontend.yml +++ b/.github/workflows/pr-tests-frontend.yml @@ -68,13 +68,11 @@ jobs: 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 + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS if: steps.changes.outputs.frontend == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Install Tox if: steps.changes.outputs.frontend == 'true' @@ -166,13 +164,11 @@ jobs: 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 + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Install Tox if: steps.changes.outputs.stack == 'true' diff --git a/.github/workflows/pr-tests-stack-public.yml b/.github/workflows/pr-tests-stack-public.yml index 6911c81a5d1..8c8748780a7 100644 --- a/.github/workflows/pr-tests-stack-public.yml +++ b/.github/workflows/pr-tests-stack-public.yml @@ -119,13 +119,11 @@ jobs: 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 + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Docker Compose on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' diff --git a/.github/workflows/pr-tests-stack.yml b/.github/workflows/pr-tests-stack.yml index 9f4d2cd7021..19277833877 100644 --- a/.github/workflows/pr-tests-stack.yml +++ b/.github/workflows/pr-tests-stack.yml @@ -143,13 +143,11 @@ jobs: 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 + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Docker Compose on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' @@ -364,13 +362,11 @@ jobs: 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 + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Docker Compose on MacOS if: steps.changes.outputs.stack == 'true' && matrix.os == 'macos-latest' diff --git a/.github/workflows/pr-tests-syft.yml b/.github/workflows/pr-tests-syft.yml index 177b836069a..06639372794 100644 --- a/.github/workflows/pr-tests-syft.yml +++ b/.github/workflows/pr-tests-syft.yml @@ -24,7 +24,7 @@ jobs: strategy: max-parallel: 99 matrix: - os: [ubuntu-latest, macos-13, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest] python-version: ["3.11"] include: - python-version: "3.9" @@ -89,16 +89,14 @@ jobs: pip install --upgrade tox packaging wheel --default-timeout=60 - name: Fix Colima issue on MacOS Runners - if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-13' + if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-latest' shell: bash run: | - export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 - brew update - brew reinstall qemu + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS - if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-13' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + if: steps.changes.outputs.syft == 'true' && matrix.os == 'macos-latest' + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Run unit tests if: steps.changes.outputs.syft == 'true' @@ -110,8 +108,8 @@ jobs: max-parallel: 99 matrix: # Disable on windows until its flakyness is reduced. - # os: [ubuntu-latest, macos-13, windows-latest] - os: [ubuntu-latest, macos-13] + # os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest] python-version: ["3.11"] deployment-type: ["python"] notebook-paths: ["tutorials"] @@ -275,13 +273,11 @@ jobs: 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 + sudo bash -c 'echo "test" > /var/log/docker.log' - name: Docker on MacOS if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'macos-latest' - uses: crazy-max/ghaction-setup-docker@v2.0.0 + uses: crazy-max/ghaction-setup-docker@v2.1.0 - name: Docker Compose on MacOS if: (steps.changes.outputs.stack == 'true' || steps.changes.outputs.notebooks == 'true') && matrix.os == 'macos-latest'