Skip to content

Commit 8b136a7

Browse files
committed
GHA update
1 parent 2a2b2a2 commit 8b136a7

File tree

1 file changed

+20
-19
lines changed

1 file changed

+20
-19
lines changed

.github/workflows/build.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,14 @@ jobs:
1414
fail-fast: false
1515
matrix:
1616
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
17-
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.x"]
17+
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.x"]
1818
exclude:
1919
# GHA no longer includes
20-
- os: ubuntu-latest
21-
python-version: "3.6"
2220
- os: ubuntu-latest
2321
python-version: "3.7"
2422

2523
# MacOS 14.4.1 for arm64 doesn't support Python < 3.8
2624
- os: macos-latest
27-
python-version: "3.6"
28-
- os: macos-latest
29-
python-version: "3.7"
30-
31-
include:
32-
# GHA doesn't list 3.6 for ubuntu-22
33-
- os: ubuntu-20.04
34-
python-version: "3.6"
35-
36-
# MacOS 13 required for Python < 3.8
37-
- os: macos-13
38-
python-version: "3.6"
39-
- os: macos-13
4025
python-version: "3.7"
4126

4227
steps:
@@ -85,9 +70,8 @@ jobs:
8570
cd project2
8671
# install project2.
8772
# --no-build-isolation is needed so that ^^^ installed dsodemo could be found.
88-
# --no-use-pep517 is used to workaround https://github.com/pypa/setuptools/issues/1694 on py36 and py35
8973
python -m pip install -v --no-index -f ../dist wheel # needed by vvv
90-
python -m pip install -v --no-index --no-build-isolation --no-use-pep517 -f ../../dist .
74+
python -m pip install -v --no-index --no-build-isolation -f ../../dist .
9175
cd ../..
9276
python -m dsodemo.cli
9377
python -m nose2 dsodemo
@@ -154,7 +138,7 @@ jobs:
154138
155139
manylinux:
156140
runs-on: ubuntu-latest
157-
name: Test ${{ matrix.pyver }} / ${{ matrix.manylinux }}_${{ matrix.piparch }}
141+
name: ${{ matrix.pyver }} / ${{ matrix.manylinux }}_${{ matrix.piparch }}
158142
strategy:
159143
fail-fast: false
160144
matrix:
@@ -212,6 +196,14 @@ jobs:
212196
piparch: "i686"
213197
pyver: "cp27-cp27mu"
214198

199+
- manylinux: "manylinux2014"
200+
piparch: "i686"
201+
pyver: "cp36-cp36m"
202+
203+
- manylinux: "manylinux2014"
204+
piparch: "i686"
205+
pyver: "cp37-cp37m"
206+
215207
- manylinux: "manylinux2014"
216208
piparch: "x86_64"
217209
pyver: "cp27-cp27m"
@@ -220,6 +212,14 @@ jobs:
220212
piparch: "x86_64"
221213
pyver: "cp27-cp27mu"
222214

215+
- manylinux: "manylinux2014"
216+
piparch: "x86_64"
217+
pyver: "cp36-cp36m"
218+
219+
- manylinux: "manylinux2014"
220+
piparch: "x86_64"
221+
pyver: "cp37-cp37m"
222+
223223
# manylinux2010 doesn't include pip with >= 3.11
224224
- manylinux: "manylinux2010"
225225
piparch: "i686"
@@ -245,6 +245,7 @@ jobs:
245245
#!/bin/sh
246246
set -e -x
247247
ls /opt/python/*/bin/python
248+
ls /opt/python/${{ matrix.pyver }}/bin/python
248249
cd /io
249250
export PATH="/opt/python/${{ matrix.pyver }}/bin:\$PATH"
250251
which python

0 commit comments

Comments
 (0)