Skip to content

Commit c87fc40

Browse files
authored
Merge branch 'master' into test_pytest_run_parallel
2 parents 2f7190d + bd6876f commit c87fc40

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
ubuntu-latest,
1515
ubuntu-20.04,
1616
macos-13,
17-
macos-12,
1817
windows-latest,
1918
windows-2019,
2019
]
@@ -25,8 +24,6 @@ jobs:
2524
architecture: x86
2625
- os: macos-13
2726
architecture: x86
28-
- os: macos-12
29-
architecture: x86
3027

3128
steps:
3229
- uses: actions/checkout@v4
@@ -45,14 +42,18 @@ jobs:
4542

4643
- name: Install
4744
run: |
48-
pip install .
45+
pip install . -v
4946
5047
- name: Test with pytest
5148
run: |
5249
pip install pytest
50+
cd doc # avoid picking up bottleneck from the source dir
5351
pytest --pyargs bottleneck
5452
5553
check:
54+
# This job is here is the "Required" one for merging PRs, and
55+
# it only runs after all the `test` jobs above have run. Hence
56+
# it serves as a check that CI actually ran before a PR gets merged.
5657
needs: test
5758
runs-on: ubuntu-latest
5859
steps:
@@ -72,7 +73,7 @@ jobs:
7273
fetch-depth: 0
7374

7475
- name: Build wheels
75-
uses: pypa/cibuildwheel@v2.21.3
76+
uses: pypa/cibuildwheel@v2.23.2
7677
env:
7778
CIBW_SKIP: pp*
7879

0 commit comments

Comments
 (0)