Skip to content

Commit

Permalink
Fix CI failures (#2106)
Browse files Browse the repository at this point in the history
* upgrade github actions for macos_arm64 and windows

* skip pp38/39

* exclude pp

* fix doc

* test

* remove CIBW_TEST_SKIP for wheel
  • Loading branch information
doichanj authored Apr 25, 2024
1 parent 2150983 commit 6f04eb8
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 30 deletions.
28 changes: 15 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macOS-latest", "ubuntu-latest", "windows-2019"]
os: ["macos-13", "ubuntu-latest", "windows-2019"]
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.8
- name: Set up Python '3.10'
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
- name: Install deps
run: pip install "conan<2.0.0"
- name: Install openblas
Expand Down Expand Up @@ -74,10 +74,10 @@ jobs:
os: ["ubuntu-latest"]
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.8
- name: Set up Python '3.10'
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
- name: Install deps
run: pip install "conan<2.0.0"
- name: Install openblas and mpi
Expand Down Expand Up @@ -121,13 +121,13 @@ jobs:
needs: ["standalone"]
strategy:
matrix:
os: ["macOS-latest", "ubuntu-latest", "windows-2019"]
os: ["macos-13", "ubuntu-latest", "windows-2019"]
steps:
- uses: actions/checkout@v4
- name: Set up Python Python 3.8
- name: Set up Python Python '3.10'
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
if: runner.os == 'Windows'
Expand All @@ -145,18 +145,20 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: ["macOS-latest"]
os: ["macos-latest"]
steps:
- uses: actions/checkout@v4
- name: Set up Python Python 3.8
- name: Set up Python Python 3.10
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
architecture: arm64
- name: Install deps
run: python -m pip install -U cibuildwheel==2.17.0
- name: Build Wheels
env:
CIBW_ARCHS_MACOS: arm64
CIBW_SKIP: "pp* cp38* cp39*"
run: cibuildwheel --output-dir wheelhouse
- uses: actions/upload-artifact@v4
with:
Expand All @@ -178,7 +180,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
Expand Down Expand Up @@ -211,7 +213,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
Expand Down
25 changes: 14 additions & 11 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,22 @@ jobs:
name: Build qiskit-aer wheels
strategy:
matrix:
os: ["macOS-latest", "ubuntu-latest", "windows-2019"]
os: ["macos-13", "ubuntu-latest", "windows-2019"]
runs-on: ${{ matrix.os }}
environment: release
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
- name: Build wheels
env:
AER_CMAKE_OPENMP_BUILD: 1
CIBW_SKIP: "pp* cp38-macosx_arm64 cp39-macosx_arm64"
run: python -m cibuildwheel --output-dir wheelhouse
- uses: actions/upload-artifact@v4
with:
Expand All @@ -43,7 +44,7 @@ jobs:
- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down Expand Up @@ -73,19 +74,21 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macOS-latest"]
os: ["macos-latest"]
environment: release
steps:
- uses: actions/checkout@v4
- name: Set up Python Python 3.8
- name: Set up Python Python '3.10'
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: '3.10'
architecture: arm64
- name: Install deps
run: python -m pip install -U cibuildwheel==2.17.0
- name: Build Wheels
env:
CIBW_ARCHS_MACOS: arm64
CIBW_SKIP: "pp* cp38* cp39*"
run: cibuildwheel --output-dir wheelhouse
- uses: actions/upload-artifact@v3
with:
Expand All @@ -103,7 +106,7 @@ jobs:
- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- name: Install Deps
run: pip install -U scikit-build wheel
- name: Build Artifacts
Expand Down Expand Up @@ -140,7 +143,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
Expand Down Expand Up @@ -183,7 +186,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==2.17.0
Expand Down Expand Up @@ -218,7 +221,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down Expand Up @@ -254,7 +257,7 @@ jobs:
- uses: actions/setup-python@v5
name: Install Python
with:
python-version: '3.8'
python-version: '3.10'
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
python-version: [3.8]
python-version: ['3.8']
steps:
- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
needs: [docs]
strategy:
matrix:
python-version: [3.8]
python-version: ['3.8']
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.8]
python-version: ['3.10']
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
python-version: [3.9]
python-version: ['3.10']
os: ["ubuntu-latest"]
env:
AER_THRUST_BACKEND: OMP
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
stestr run --slowest
shell: bash
tests_macos:
runs-on: macOS-latest
runs-on: macos-13
name: macOS Python ${{ matrix.python-version }}
needs: [sdist, lint]
timeout-minutes: 60
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
[tool.cibuildwheel]
manylinux-x86_64-image = "manylinux2014"
manylinux-i686-image = "manylinux2014"
skip = "pp* cp36* cp37* *musllinux*"
skip = "pp* cp36* cp37* *musllinux* cp38-macosx_arm64"
test-skip = "cp3*-win32 cp3*-manylinux_i686"
test-command = "python {project}/tools/verify_wheels.py"
# We need to use pre-built versions of Numpy and Scipy in the tests; they have a
Expand Down

0 comments on commit 6f04eb8

Please sign in to comment.