Skip to content

Commit

Permalink
Merge pull request #8246 from madhavajay/madhava/upgrade_gh_docker
Browse files Browse the repository at this point in the history 
Upgrade ghaction-setup-docker
  • Loading branch information
@madhavajay
madhavajay authored Nov 13, 2023
2 parents 2e9522e + 4a54fcb commit f1e093c
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 33 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/pr-tests-frontend.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/pr-tests-stack-public.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
12 changes: 4 additions & 8 deletions .github/workflows/pr-tests-stack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
22 changes: 9 additions & 13 deletions .github/workflows/pr-tests-syft.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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'
Expand All @@ -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"]
Expand Down Expand Up @@ -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'
Expand Down

0 comments on commit f1e093c

Please sign in to comment.