From 5dcc08d2be4367b3f6bf71795aa6f5cc8035ba8b Mon Sep 17 00:00:00 2001 From: Matt M Date: Tue, 17 Sep 2024 16:05:16 -0700 Subject: [PATCH] asdf --- .github/workflows/python.yml | 2 +- photon-lib/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 6c1ceb158..ffce89136 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -167,7 +167,7 @@ jobs: - run: git fetch --tags --force - name: Install RoboRIO Toolchain - run: ./gradlew installRoboRioToolchain + run: ./gradlew installRoboRioToolchain -PpythonExecutable=/build/venv/bin/cross-python if: matrix.os.name == 'roborio' - run: | diff --git a/photon-lib/build.gradle b/photon-lib/build.gradle index 721406027..3c346dd7c 100644 --- a/photon-lib/build.gradle +++ b/photon-lib/build.gradle @@ -41,7 +41,7 @@ nativeUtils { } def getPythonIncludePath = { - def pythonexe = project.findProperty('pythonExecutable') ?: 'python3.10' + def pythonexe = project.findProperty('pythonExecutable') ?: 'python3' def stdout = new ByteArrayOutputStream() exec { commandLine pythonexe, '-c', "from sysconfig import get_paths as gp; print(gp()[\"include\"])" @@ -53,7 +53,7 @@ def getPythonIncludePath = { } def getPythonLibrarySuffix = { - def pythonexe = project.findProperty('pythonExecutable') ?: 'python3.10' + def pythonexe = project.findProperty('pythonExecutable') ?: 'python3' def stdout = new ByteArrayOutputStream() exec { commandLine pythonexe, '-c', "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))"