Skip to content

Commit 41b9151

Browse files
committed
refactor(workflows): streamline package installation in CI scripts
- Updated package installation commands to use the new 'packaging' extras. - Removed conditional installation of cx_Freeze stable version for cleaner workflow. - Enhanced the winget workflow to include ARM64 architecture support.
1 parent 07bc858 commit 41b9151

5 files changed

Lines changed: 11 additions & 20 deletions

File tree

.github/workflows/pr-check.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ jobs:
170170
run: |
171171
.\venv\Scripts\Activate
172172
python -m pip install --upgrade pip
173-
pip install --force --no-cache .
174-
pip install git+https://github.com/amnweb/cx_Freeze.git@fix/msi-product-name
175-
pip install git+https://github.com/amnweb/python-msilib --force --no-cache
173+
pip install --force --no-cache .[packaging]
176174
shell: pwsh
177175

178176
- name: Build Installer
@@ -241,9 +239,7 @@ jobs:
241239
run: |
242240
.\venv\Scripts\Activate
243241
python -m pip install --upgrade pip
244-
pip install --force --no-cache .
245-
pip install git+https://github.com/amnweb/cx_Freeze.git@fix/msi-product-name
246-
pip install git+https://github.com/amnweb/python-msilib --force --no-cache
242+
pip install --force --no-cache .[packaging]
247243
shell: pwsh
248244

249245
- name: Build EXE

.github/workflows/windows-dev.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,12 @@ jobs:
8585
run: |
8686
.\venv\Scripts\Activate
8787
python -m pip install --upgrade pip
88-
pip install --force --no-cache .
88+
pip install --force --no-cache .[packaging]
8989
$cxFreezeVersion = "${{ github.event.inputs.cx_freeze_version }}"
9090
if ($cxFreezeVersion -eq "dev") {
9191
Write-Host "Installing cx_Freeze dev version from GitHub"
9292
pip install git+https://github.com/amnweb/cx_Freeze.git@fix/msi-product-name
9393
pip install git+https://github.com/amnweb/python-msilib --force --no-cache
94-
} else {
95-
Write-Host "Installing cx_Freeze stable version"
96-
pip install --force --no-cache --upgrade cx_Freeze
9794
}
9895
shell: pwsh
9996

.github/workflows/windows.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,12 @@ jobs:
6161
run: |
6262
.\venv\Scripts\Activate
6363
python -m pip install --upgrade pip
64-
pip install --force --no-cache .
64+
pip install --force --no-cache .[packaging]
6565
if ("${{ github.event.inputs.cx_freeze_version }}" -eq "dev") {
6666
Write-Host "Installing cx_Freeze dev version from GitHub"
6767
pip install git+https://github.com/amnweb/cx_Freeze.git@fix/msi-product-name
6868
pip install git+https://github.com/amnweb/python-msilib --force --no-cache
69-
} else {
70-
Write-Host "Installing cx_Freeze stable version"
71-
pip install --force --no-cache --upgrade cx_Freeze
72-
}
69+
}
7370
shell: pwsh
7471

7572
- name: Build EXE

.github/workflows/winget.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,13 @@ jobs:
2626
# Get both x64 and aarch64 MSI URLs
2727
$assets = $targetRelease | Select-Object -ExpandProperty assets
2828
$x64Url = $assets | Where-Object -Property name -match 'x64\.msi$' | Select-Object -ExpandProperty browser_download_url
29-
# Temporarily disabled ARM64
30-
# $aarch64Url = $assets | Where-Object -Property name -match 'aarch64\.msi$' | Select-Object -ExpandProperty browser_download_url
29+
$aarch64Url = $assets | Where-Object -Property name -match 'aarch64\.msi$' | Select-Object -ExpandProperty browser_download_url
3130
3231
$relaseTitle = "New version: AmN.yasb version $packageVersion"
3332
$relaseUrl = $targetRelease.html_url
3433
$relaseDate = [datetime]::Parse($targetRelease.published_at).ToString("yyyy-MM-dd")
3534
3635
# Update package using wingetcreate with both architectures
3736
Invoke-WebRequest https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe
38-
# Temporarily submitting only x64
3937
.\wingetcreate.exe update $packageId --version $packageVersion --urls "$x64Url|x64" --prtitle "$relaseTitle" --release-notes-url "$relaseUrl" --release-date "$relaseDate" --submit --token $gitToken
40-
# .\wingetcreate.exe update $packageId --version $packageVersion --urls "$x64Url|x64" "$aarch64Url|arm64" --prtitle "$relaseTitle" --release-notes-url "$relaseUrl" --release-date "$relaseDate" --submit --token $gitToken
38+
.\wingetcreate.exe update $packageId --version $packageVersion --urls "$x64Url|x64" "$aarch64Url|arm64" --prtitle "$relaseTitle" --release-notes-url "$relaseUrl" --release-date "$relaseDate" --submit --token $gitToken

pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ dev = [
6262
"pyqt6-stubs",
6363
"types-pillow",
6464
]
65-
65+
packaging = [
66+
"cx-Freeze==8.5.0",
67+
"python-msilib @ git+https://github.com/amnweb/python-msilib.git"
68+
]
6669
[tool.hatch.metadata]
6770
allow-direct-references = true
6871

0 commit comments

Comments
 (0)