Skip to content

Commit 39d166b

Browse files
committed
Final cleanup (hopefully)
1 parent 609a908 commit 39d166b

File tree

3 files changed

+6
-29
lines changed

3 files changed

+6
-29
lines changed

.github/workflows/build_binaries.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313

1414
steps:
15+
1516
- name: Check-out repository
1617
uses: actions/checkout@v5
1718

1819
- name: Install poetry
19-
#run: pipx install poetry
20-
run: |
21-
pipx install poetry
22-
which python
23-
which poetry
24-
which python
25-
python --version
20+
run: pipx install poetry
2621

2722
- name: Setup Python
2823
id: setup_python
@@ -33,19 +28,6 @@ jobs:
3328

3429
- run: poetry install
3530

36-
# - name: Install system build deps (Linux)
37-
# if: matrix.os == 'ubuntu-latest'
38-
# run: |
39-
# sudo apt-get update
40-
# sudo apt-get install -y python3-dev patchelf gcc
41-
42-
- name: show py
43-
run: |
44-
which python
45-
which poetry
46-
echo $PATH
47-
python --version
48-
4931
- name: Build (Windows)
5032
if: matrix.os == 'windows-latest'
5133
shell: pwsh

scripts/build-macos.sh

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -euo pipefail
2+
set -xeuo pipefail
33

44
# Build DerpiWallpaper for macOS using Nuitka
55

@@ -18,11 +18,7 @@ if ! grep -Fxq "$version" data/version.txt; then
1818
exit 1
1919
fi
2020

21-
mkdir -p build
22-
deactivate || true
23-
poetry install
24-
source .venv/bin/activate
25-
python -m nuitka \
21+
poetry run nuitka \
2622
./derpiwallpaper/__main__.py \
2723
--onefile \
2824
--enable-plugin=pyside6 \

scripts/build-windows.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ if ($content -ne $version) {
2323
throw "data/version.txt content does not match $version"
2424
}
2525

26-
New-Item -ItemType Directory -Force -Path build | Out-Null
27-
poetry install
28-
poetry run python -m nuitka `
26+
27+
poetry run nuitka `
2928
.\derpiwallpaper\__main__.py `
3029
--msvc=latest `
3130
--onefile `

0 commit comments

Comments
 (0)