From f115b514cae213a8b575c4733a9554b21c8a9d2b Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Wed, 15 Nov 2023 14:29:40 +0100 Subject: [PATCH] update the selected python3 version Signed-off-by: Matthieu Gallien --- .github/workflows/windows-build-and-test.yml | 2 +- craftmaster.ini | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml index 98fc5f2b6ef24..d930651caa96e 100644 --- a/.github/workflows/windows-build-and-test.yml +++ b/.github/workflows/windows-build-and-test.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.8' + python-version: '3.12' - name: Install Craft Master with Nextcloud Client Deps shell: pwsh run: | diff --git a/craftmaster.ini b/craftmaster.ini index 095286a8686fa..c1ef10c28fe71 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -19,7 +19,7 @@ General/MacDeploymentTarget = 10.15 ## This is the location of your python installation. ## This value must be set. -Paths/Python = C:\Python39-x64 +Paths/Python = C:\Python312-x64 Paths/Python27 = C:\Python27-x64 Compile/BuildType = RelWithDebInfo @@ -34,7 +34,7 @@ ShortPath/EnableJunctions = False Packager/PackageType = NullsoftInstallerPackager Packager/RepositoryUrl = https://files.kde.org/craft/master/ -ContinuousIntegration/Enabled = True +ContinuousIntegration/Enabled = False ## This option can be used to override the default make program ## change the value to the path of the executable you want to use instead. @@ -53,15 +53,9 @@ Packager/CacheDir = ${Variables:Root}\cache [BlueprintSettings] # don't try to pip install on the ci -python-modules.ignored = True -dev-utils/python2.ignored = True -dev-utils/python3.ignored = True nextcloud-client.buildTests = True -binary/mysql.useMariaDB = False [windows-msvc2019_64-cl] -QtSDK/Compiler = msvc2019_64 -General/ABI = windows-msvc2019_64-cl [macos-64-clang] General/ABI = macos-64-clang @@ -80,4 +74,4 @@ Compile/BuildType = Debug [Env] CRAFT_CODESIGN_CERTIFICATE = -SIGN_PACKAGE = False \ No newline at end of file +SIGN_PACKAGE = False