@@ -148,18 +148,17 @@ jobs:
148
148
operating_system=linux
149
149
python_dot_version=3.8
150
150
python_version=38
151
- echo -n "python$python_dot_version " > PYTHON_EXECUTABLE
151
+ echo -n "python3 " > PYTHON_EXECUTABLE
152
152
rm -rf thirdparty build dist
153
153
rm -rf .eggs src/scancode_toolkit.egg-info src/scancode_toolkit_mini.egg-info
154
154
mkdir -p thirdparty
155
155
venv/bin/python etc/scripts/fetch_thirdparty.py \
156
156
--requirements=requirements-linux.txt \
157
157
--requirements=requirements.txt \
158
- --sdist-only libfwsi-python \
159
158
--dest=thirdparty \
160
- --python-version=$python_version \
161
159
--operating-system=$operating_system \
162
160
--wheels
161
+ # --python-version=$python_version \
163
162
venv/bin/python etc/scripts/fetch_thirdparty.py \
164
163
--requirements=requirements-native.txt \
165
164
--requirements=requirements-linux.txt \
@@ -171,7 +170,7 @@ jobs:
171
170
--dest=thirdparty \
172
171
--sdists
173
172
venv/bin/python setup.py --quiet sdist --formats=$formats
174
- venv/bin/python etc/release/scancode_rename_archives.py dist/ _py$python_version -$operating_system
173
+ venv/bin/python etc/release/scancode_rename_archives.py dist/ _py3 -$operating_system
175
174
176
175
- name : Collect built linux app
177
176
uses : actions/upload-artifact@v3
@@ -203,25 +202,23 @@ jobs:
203
202
./configure --dev
204
203
./scancode --reindex-licenses
205
204
206
-
207
205
- name : Build mac app archive
208
206
run : |
209
207
source venv/bin/activate
210
208
formats=xztar
211
209
operating_system=macos
212
210
python_dot_version=3.8
213
211
python_version=38
214
- echo -n "python$python_dot_version " > PYTHON_EXECUTABLE
212
+ echo -n "python3 " > PYTHON_EXECUTABLE
215
213
rm -rf thirdparty build dist
216
214
rm -rf .eggs src/scancode_toolkit.egg-info src/scancode_toolkit_mini.egg-info
217
215
mkdir -p thirdparty
218
216
venv/bin/python etc/scripts/fetch_thirdparty.py \
219
217
--requirements=requirements.txt \
220
- --sdist-only libfwsi-python \
221
218
--dest=thirdparty \
222
- --python-version=$python_version \
223
219
--operating-system=$operating_system \
224
220
--wheels
221
+ # --python-version=$python_version \
225
222
venv/bin/python etc/scripts/fetch_thirdparty.py \
226
223
--requirements=requirements-native.txt \
227
224
--wheel-only extractcode \
@@ -233,7 +230,7 @@ jobs:
233
230
--dest=thirdparty \
234
231
--sdists
235
232
venv/bin/python setup.py --quiet sdist --formats=$formats
236
- venv/bin/python etc/release/scancode_rename_archives.py dist/ _py$python_version -$operating_system
233
+ venv/bin/python etc/release/scancode_rename_archives.py dist/ _py3 -$operating_system
237
234
238
235
- name : Collect built mac app
239
236
uses : actions/upload-artifact@v3
@@ -278,11 +275,10 @@ jobs:
278
275
mkdir -p thirdparty
279
276
venv/bin/python etc/scripts/fetch_thirdparty.py \
280
277
--requirements=requirements.txt \
281
- --sdist-only libfwsi-python \
282
278
--dest=thirdparty \
283
- --python-version=$python_version \
284
279
--operating-system=$operating_system \
285
280
--wheels
281
+ # --python-version=$python_version \
286
282
venv/bin/python etc/scripts/fetch_thirdparty.py \
287
283
--requirements=requirements-native.txt \
288
284
--wheel-only extractcode \
@@ -464,7 +460,7 @@ jobs:
464
460
strategy :
465
461
fail-fast : true
466
462
matrix :
467
- os : [ubuntu-20 .04]
463
+ os : [ubuntu-18.04, ubuntu-20.04, ubuntu-22 .04]
468
464
pyver : [3.8]
469
465
470
466
steps :
@@ -502,7 +498,7 @@ jobs:
502
498
strategy :
503
499
fail-fast : true
504
500
matrix :
505
- os : [macos-12]
501
+ os : [macos-10.15, macos-11, macos- 12]
506
502
pyver : [3.8]
507
503
508
504
steps :
@@ -540,7 +536,7 @@ jobs:
540
536
strategy :
541
537
fail-fast : true
542
538
matrix :
543
- os : [windows-2022]
539
+ os : [windows-2019, windows- 2022]
544
540
pyver : [3.8]
545
541
546
542
steps :
0 commit comments