Skip to content

Commit 13d6b69

Browse files
committed
Adapt build dependencies for Windows
1 parent 37889dc commit 13d6b69

File tree

3 files changed

+4
-18
lines changed

3 files changed

+4
-18
lines changed

.github/workflows/cd-windows.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- name: Build onedir
4747
run: |
4848
Invoke-Expression "$(poetry env info --path)\Scripts\Activate.ps1"
49-
make build-ui
5049
pyinstaller ci-scripts/windows/pyinstaller/nitrokey-app-onedir.spec
5150
- name: Upload artifacts
5251
uses: actions/upload-artifact@v4
@@ -74,7 +73,6 @@ jobs:
7473
- name: Build onefile
7574
run: |
7675
Invoke-Expression "$(poetry env info --path)\Scripts\Activate.ps1"
77-
make build-ui
7876
pyinstaller ci-scripts/windows/pyinstaller/nitrokey-app-onefile.spec
7977
- name: Upload artifacts
8078
uses: actions/upload-artifact@v4

ci-scripts/windows/pyinstaller/nitrokey-app-onedir.spec

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ import os
55
venv_path = os.popen('poetry env info --path').read().rstrip()
66

77
datas = [
8-
(venv_path + '\\Lib\\site-packages\\pynitrokey\\VERSION', 'pynitrokey'),
98
(venv_path + '\\Lib\\site-packages\\fido2\\public_suffix_list.dat', 'fido2'),
109
('..\\..\\..\\nitrokeyapp\\ui', 'nitrokeyapp\\ui'),
1110
('..\\..\\..\\LICENSE', '.')
1211
]
1312
datas += copy_metadata('ecdsa')
1413
datas += copy_metadata('fido2')
1514
datas += copy_metadata('nitrokeyapp')
16-
datas += copy_metadata('pynitrokey')
17-
datas += copy_metadata('pyusb')
18-
datas += copy_metadata('spsdk')
15+
datas += copy_metadata('nitrokey')
1916

2017

2118
block_cipher = None
@@ -24,10 +21,7 @@ block_cipher = None
2421
a = Analysis(
2522
['..\\..\\..\\nitrokeyapp\\__main__.py'],
2623
pathex=[],
27-
binaries=[
28-
(venv_path + '\\Lib\\site-packages\\libusbsio\\bin\\x64\\libusbsio.dll', 'libusbsio'),
29-
(venv_path + '\\Lib\\site-packages\\usb1\\libusb-1.0.dll', '.')
30-
],
24+
binaries=[],
3125
datas=datas,
3226
hiddenimports=[],
3327
hookspath=[],

ci-scripts/windows/pyinstaller/nitrokey-app-onefile.spec

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,14 @@ import os
55
venv_path = os.popen('poetry env info --path').read().rstrip()
66

77
datas = [
8-
(venv_path + '\\Lib\\site-packages\\pynitrokey\\VERSION', 'pynitrokey'),
98
(venv_path + '\\Lib\\site-packages\\fido2\\public_suffix_list.dat', 'fido2'),
109
('..\\..\\..\\nitrokeyapp\\ui', 'nitrokeyapp\\ui'),
1110
('..\\..\\..\\LICENSE', '.')
1211
]
1312
datas += copy_metadata('ecdsa')
1413
datas += copy_metadata('fido2')
1514
datas += copy_metadata('nitrokeyapp')
16-
datas += copy_metadata('pynitrokey')
17-
datas += copy_metadata('pyusb')
18-
datas += copy_metadata('spsdk')
15+
datas += copy_metadata('nitrokey')
1916

2017

2118
block_cipher = None
@@ -24,10 +21,7 @@ block_cipher = None
2421
a = Analysis(
2522
['..\\..\\..\\nitrokeyapp\\__main__.py'],
2623
pathex=[],
27-
binaries=[
28-
(venv_path + '\\Lib\\site-packages\\libusbsio\\bin\\x64\\libusbsio.dll', 'libusbsio'),
29-
(venv_path + '\\Lib\\site-packages\\usb1\\libusb-1.0.dll', '.')
30-
],
24+
binaries=[],
3125
datas=datas,
3226
hiddenimports=[],
3327
hookspath=[],

0 commit comments

Comments
 (0)