Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

attempt to fix test-os #95

Merged
merged 2 commits into from
May 16, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 13 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: set up python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- uses: dtolnay/rust-toolchain@master
with:
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
- name: set up python
uses: actions/setup-python@v4
with:
python-version: '3.11'
python-version: '3.12'

- uses: dtolnay/rust-toolchain@stable

Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [linux, macos, windows]
os: [linux] # windows and macos builds added manually
target: [x86_64, aarch64]
manylinux: [auto]
include:
Expand Down Expand Up @@ -255,8 +255,10 @@ jobs:
# target: aarch64
# interpreter: 3.11 3.12
exclude:
- os: windows
target: aarch64
# PGO optimized below
- os: linux
manylinux: auto
target: x86_64

runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
steps:
Expand All @@ -265,7 +267,7 @@ jobs:
- name: set up python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'
architecture: ${{ matrix.python-architecture || 'x64' }}

- name: build wheels
Expand All @@ -275,7 +277,6 @@ jobs:
manylinux: ${{ matrix.manylinux }}
args: --release --out dist --interpreter ${{ matrix.interpreter || '3.8 3.9 3.10 3.11 3.12' }}
rust-toolchain: stable
docker-options: -e CI
working-directory: crates/jiter-python

- run: ${{ (matrix.os == 'windows' && 'dir') || 'ls -lh' }} crates/jiter-python/dist/
Expand Down Expand Up @@ -340,7 +341,6 @@ jobs:
--out pgo-wheel
--interpreter ${{ matrix.interpreter }}
rust-toolchain: stable
docker-options: -e CI
working-directory: crates/jiter-python
env:
RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata"
Expand Down Expand Up @@ -372,7 +372,6 @@ jobs:
--out dist
--interpreter ${{ matrix.interpreter }}
rust-toolchain: stable
docker-options: -e CI
working-directory: crates/jiter-python
env:
RUSTFLAGS: "-Cprofile-use=${{ github.workspace }}/merged.profdata"
Expand Down Expand Up @@ -462,8 +461,7 @@ jobs:
# typing-extensions isn't automatically installed because of `--no-index --no-deps`
python3 -m venv venv
source venv/bin/activate
python3 -m pip install -U pip typing-extensions
python3 -m pip install -r tests/requirements.txt
python3 -m pip install -U pip -r tests/requirements.txt
python3 -m pip install jiter --no-index --no-deps --find-links dist --force-reinstall
python3 -c 'import jiter; print(jiter.__version__)'

Expand All @@ -483,7 +481,7 @@ jobs:
- name: set up python
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.12'

- name: get dist artifacts
uses: actions/download-artifact@v4
Expand All @@ -495,10 +493,9 @@ jobs:
- name: run tests
run: |
cd crates/jiter-python
pip install typing-extensions
pip install -r tests/requirements.txt
pip install jiter --no-index --no-deps --find-links dist --force-reinstall
pytest
python3 -m pip install -U pip -r tests/requirements.txt
python3 -m pip install jiter --no-index --no-deps --find-links dist --force-reinstall
python3 -m pytest


# https://github.com/marketplace/actions/alls-green#why used for branch protection checks
Expand Down
Loading