Skip to content

Commit 06bd0bb

Browse files
authored
attempt to fix test-os (#95)
1 parent 741e77f commit 06bd0bb

File tree

1 file changed

+13
-16
lines changed

1 file changed

+13
-16
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: set up python
2929
uses: actions/setup-python@v4
3030
with:
31-
python-version: '3.11'
31+
python-version: '3.12'
3232

3333
- uses: dtolnay/rust-toolchain@master
3434
with:
@@ -79,7 +79,7 @@ jobs:
7979
- name: set up python
8080
uses: actions/setup-python@v4
8181
with:
82-
python-version: '3.11'
82+
python-version: '3.12'
8383

8484
- uses: dtolnay/rust-toolchain@stable
8585

@@ -203,7 +203,7 @@ jobs:
203203
strategy:
204204
fail-fast: false
205205
matrix:
206-
os: [linux, macos, windows]
206+
os: [linux] # windows and macos builds added manually
207207
target: [x86_64, aarch64]
208208
manylinux: [auto]
209209
include:
@@ -255,8 +255,10 @@ jobs:
255255
# target: aarch64
256256
# interpreter: 3.11 3.12
257257
exclude:
258-
- os: windows
259-
target: aarch64
258+
# PGO optimized below
259+
- os: linux
260+
manylinux: auto
261+
target: x86_64
260262

261263
runs-on: ${{ (matrix.os == 'linux' && 'ubuntu') || matrix.os }}-latest
262264
steps:
@@ -265,7 +267,7 @@ jobs:
265267
- name: set up python
266268
uses: actions/setup-python@v5
267269
with:
268-
python-version: '3.11'
270+
python-version: '3.12'
269271
architecture: ${{ matrix.python-architecture || 'x64' }}
270272

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

281282
- run: ${{ (matrix.os == 'windows' && 'dir') || 'ls -lh' }} crates/jiter-python/dist/
@@ -340,7 +341,6 @@ jobs:
340341
--out pgo-wheel
341342
--interpreter ${{ matrix.interpreter }}
342343
rust-toolchain: stable
343-
docker-options: -e CI
344344
working-directory: crates/jiter-python
345345
env:
346346
RUSTFLAGS: "-Cprofile-generate=${{ github.workspace }}/profdata"
@@ -372,7 +372,6 @@ jobs:
372372
--out dist
373373
--interpreter ${{ matrix.interpreter }}
374374
rust-toolchain: stable
375-
docker-options: -e CI
376375
working-directory: crates/jiter-python
377376
env:
378377
RUSTFLAGS: "-Cprofile-use=${{ github.workspace }}/merged.profdata"
@@ -462,8 +461,7 @@ jobs:
462461
# typing-extensions isn't automatically installed because of `--no-index --no-deps`
463462
python3 -m venv venv
464463
source venv/bin/activate
465-
python3 -m pip install -U pip typing-extensions
466-
python3 -m pip install -r tests/requirements.txt
464+
python3 -m pip install -U pip -r tests/requirements.txt
467465
python3 -m pip install jiter --no-index --no-deps --find-links dist --force-reinstall
468466
python3 -c 'import jiter; print(jiter.__version__)'
469467
@@ -483,7 +481,7 @@ jobs:
483481
- name: set up python
484482
uses: actions/setup-python@v5
485483
with:
486-
python-version: '3.11'
484+
python-version: '3.12'
487485

488486
- name: get dist artifacts
489487
uses: actions/download-artifact@v4
@@ -495,10 +493,9 @@ jobs:
495493
- name: run tests
496494
run: |
497495
cd crates/jiter-python
498-
pip install typing-extensions
499-
pip install -r tests/requirements.txt
500-
pip install jiter --no-index --no-deps --find-links dist --force-reinstall
501-
pytest
496+
python3 -m pip install -U pip -r tests/requirements.txt
497+
python3 -m pip install jiter --no-index --no-deps --find-links dist --force-reinstall
498+
python3 -m pytest
502499
503500
504501
# https://github.com/marketplace/actions/alls-green#why used for branch protection checks

0 commit comments

Comments
 (0)