From 37782670a3f20eda42f7796fd4f48878a4cfbd6c Mon Sep 17 00:00:00 2001 From: hedger Date: Tue, 9 Jul 2024 15:08:41 +0300 Subject: [PATCH] fixed Python executable name --- .github/workflows/test.yml | 2 +- ufbt/__init__.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 16dc11f..e6bc91e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.11] + python-version: [3.8, 3.11, 3.12] steps: - uses: actions/checkout@v2 diff --git a/ufbt/__init__.py b/ufbt/__init__.py index 3ed8187..da5a068 100644 --- a/ufbt/__init__.py +++ b/ufbt/__init__.py @@ -96,15 +96,14 @@ def ufbt_cli(): UFBT_APP_DIR = os.getcwd() if platform.system() == "Windows": + commandline = r'call "%UFBT_STATE_DIR%/current/scripts/toolchain/fbtenv.cmd" env & python ' + else: commandline = ( - r'call "%UFBT_STATE_DIR%/current/scripts/toolchain/fbtenv.cmd" env & ' + '. "$UFBT_STATE_DIR/current/scripts/toolchain/fbtenv.sh" && python3 ' ) - else: - commandline = '. "$UFBT_STATE_DIR/current/scripts/toolchain/fbtenv.sh" && ' commandline += oslex.join( [ - "python3", "-m", "SCons", "-Q",