Skip to content

Commit

Permalink
[Misc] Rollback win32 to Py3.12, for prebuilt winsdk
Browse files Browse the repository at this point in the history
  • Loading branch information
melianmiko committed Feb 7, 2025
1 parent cf53295 commit 57b6cd6
Show file tree
Hide file tree
Showing 5 changed files with 83 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .github/workflows/on_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ name: Build & Test
on: push

jobs:
BuildExe:
build_exe:
name: Windows portable build
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
- uses: pdm-project/setup-pdm@v4
with:
python-version: 3.13
python-version: 3.12
cache: true
- name: Install Just
run: choco install just
Expand All @@ -22,7 +23,8 @@ jobs:
path: .\dist\*
if-no-files-found: error

TestAndBuildDebian:
build_deb:
name: Run PyTest and build Debian package
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 4 additions & 2 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ Vagrant.configure("2") do |config|
win.vm.box = "gusztavvargadr/windows-11-24h2-enterprise"
win.vm.synced_folder ".", "C:\\openfreebuds"
win.vm.provider "vmware_desktop" do |v|
v.vmx["numvcpus"] = "4"
v.vmx["memsize"] = "4096"
v.gui = true
end

Expand All @@ -86,8 +88,8 @@ Vagrant.configure("2") do |config|
winget install -e --accept-source-agreements --no-upgrade --id Casey.Just
winget install -e --no-upgrade --id NSIS.NSIS
winget install -e --no-upgrade --id UPX.UPX
winget install -e --no-upgrade --id Python.Python.3.13
winget install -e --no-upgrade --id Microsoft.VisualStudio.2022.BuildTools --override "--passive --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended"
winget install -e --no-upgrade --id Python.Python.3.12
# winget install -e --no-upgrade --id Microsoft.VisualStudio.2022.BuildTools --override "--passive --wait --add Microsoft.VisualStudio.Workload.VCTools;includeRecommended"
SHELL

win.vm.provision "shell",
Expand Down
3 changes: 3 additions & 0 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ test:
prepare:
pdm install

vg_all:
vagrant halt -f
vagrant up --parallel


# ------------------------------------------------
Expand Down
70 changes: 69 additions & 1 deletion pdm.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ dev = [
"pytest<9.0.0,>=8.3.2",
"pytest-asyncio<1.0.0,>=0.24.0",
"pyinstaller==6.10.0; sys_platform == 'win32'",
# lrelease.exe provider
"pyside6>=6.8.2.1; sys_platform == 'win32'",
]
no_flatpak = [
"pyqt6<7.0.0,>=6.7.1",
Expand Down

0 comments on commit 57b6cd6

Please sign in to comment.