Skip to content

Commit

Permalink
ignore fix for now
Browse files Browse the repository at this point in the history
  • Loading branch information
avishniakov committed Nov 20, 2024
1 parent 4b58a95 commit 1dd8957
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 49 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/ci-slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -223,38 +223,38 @@ jobs:
# python-version: ${{ matrix.python-version }}
# os: ${{ matrix.os }}
# secrets: inherit
macos-linting:
# needs: run-slow-ci-label-is-set
if: github.event.pull_request.draft == false
strategy:
matrix:
os: [macos-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']
fail-fast: false
uses: ./.github/workflows/linting.yml
with:
python-version: ${{ matrix.python-version }}
os: ${{ matrix.os }}
secrets: inherit
macos-unit-test:
if: github.event.pull_request.draft == false
# needs: [run-slow-ci-label-is-set, macos-linting]
strategy:
matrix:
os: [macos-latest]
python-version: ['3.9', '3.10', '3.11', '3.12']
# Python 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
# https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
# exclude:
# - {python-version: '3.9', os: macos-latest}
# include:
# - {python-version: '3.9', os: macos-13}
fail-fast: false
uses: ./.github/workflows/unit-test.yml
with:
python-version: ${{ matrix.python-version }}
os: ${{ matrix.os }}
secrets: inherit
# macos-linting:
# needs: run-slow-ci-label-is-set
# if: github.event.pull_request.draft == false
# strategy:
# matrix:
# os: [macos-latest]
# python-version: ['3.9', '3.10', '3.11', '3.12']
# fail-fast: false
# uses: ./.github/workflows/linting.yml
# with:
# python-version: ${{ matrix.python-version }}
# os: ${{ matrix.os }}
# secrets: inherit
# macos-unit-test:
# if: github.event.pull_request.draft == false
# needs: [run-slow-ci-label-is-set, macos-linting]
# strategy:
# matrix:
# os: [macos-latest]
# python-version: ['3.9', '3.10', '3.11', '3.12']
# # Python 3.9 is on macos-13 but not macos-latest (macos-14-arm64)
# # https://github.com/actions/setup-python/issues/696#issuecomment-1637587760
# # exclude:
# # - {python-version: '3.9', os: macos-latest}
# # include:
# # - {python-version: '3.9', os: macos-13}
# fail-fast: false
# uses: ./.github/workflows/unit-test.yml
# with:
# python-version: ${{ matrix.python-version }}
# os: ${{ matrix.os }}
# secrets: inherit
# windows-integration-test:
# if: github.event.pull_request.draft == false
# needs: [run-slow-ci-label-is-set, windows-unit-test]
Expand Down
34 changes: 17 additions & 17 deletions .github/workflows/integration-test-slow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -161,23 +161,23 @@ jobs:
- name: Install MacOS System Dependencies
if: runner.os=='macOS'
run: brew install libomp
- name: Unbreak Python in GHA for 3.9-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&3.12
if: runner.os=='macOS' && ( inputs.python-version == '3.11' || inputs.python-version
== '3.12' )
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: Unbreak Python in GHA for 3.9-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&3.12
# if: runner.os=='macOS' && ( inputs.python-version == '3.11' || inputs.python-version
# == '3.12' )
# 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 1dd8957

Please sign in to comment.