From ce50c497b01df4deedf6d3dc3229a363309c2d00 Mon Sep 17 00:00:00 2001 From: Rayyan Ansari Date: Fri, 10 Mar 2023 17:51:03 +0000 Subject: [PATCH] Windows: simplify building Use the standard pip build command, and get rid of the build script. --- .github/workflows/windows.yml | 5 +++-- scripts/msys2-build | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 scripts/msys2-build diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c639066a2..505765b50 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,7 +22,9 @@ jobs: - name: Install dependencies run: ./scripts/msys2-install-deps development - name: Build - run: ./scripts/msys2-build + run: | + pip install -e . + pyinstaller -y scripts/borg.exe.spec - uses: actions/upload-artifact@v3 with: name: borg-windows @@ -30,5 +32,4 @@ jobs: - name: Run tests run: | ./dist/borg.exe -V - pip install -e . pytest --benchmark-skip -vv -rs -k "not remote" diff --git a/scripts/msys2-build b/scripts/msys2-build deleted file mode 100644 index 963c99d4b..000000000 --- a/scripts/msys2-build +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -python setup.py build_ext --inplace -python setup.py bdist_wheel -pyinstaller -y scripts/borg.exe.spec