Skip to content

Commit

Permalink
Merge branch 'develop' into feature/trycatchdocker
Browse files Browse the repository at this point in the history
  • Loading branch information
strickvl committed Mar 12, 2024
2 parents 01a595e + 03f34e5 commit d26b367
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/integration-test-fast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,16 @@ jobs:
- name: Install Windows System Dependencies
if: runner.os=='Windows'
run: choco install graphviz
- name: Unbreak python in github actions
if: runner.os=='macOS'
# github actions overwrites brew's python. Force it to reassert itself, by
# running in a separate step.
# Workaround GitHub Actions Python issues
# see https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1989441193
run: |
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
sudo rm -rf /Library/Frameworks/Python.framework/
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
- name: Install Docker and Colima on MacOS
if: runner.os=='macOS'
run: |
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/integration-test-slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,22 @@ jobs:
- name: Install Windows System Dependencies
if: runner.os=='Windows'
run: choco install graphviz
- name: Unbreak Python in GHA for 3.8-3.10
if: runner.os=='macOS' && inputs.python-version != '3.11'
# github actions overwrites brew's python. Force it to reassert itself, by
# running in a separate step.
# Workaround GitHub Actions Python issues
# see https://github.com/Homebrew/homebrew-core/issues/165793#issuecomment-1989441193
run: |
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
sudo rm -rf /Library/Frameworks/Python.framework/
brew install --force python3 && brew unlink python3 && brew unlink python3 && brew link --overwrite python3
- name: Unbreak Python in GHA for 3.11
if: runner.os=='macOS' && inputs.python-version == '3.11'
run: |
# Unlink and re-link to prevent errors when github mac runner images
# https://github.com/actions/setup-python/issues/577
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
- name: Install Docker and Colima on MacOS
if: runner.os=='macOS'
run: |
Expand Down

0 comments on commit d26b367

Please sign in to comment.