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..be53211901f0c 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -19,53 +19,36 @@ 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 - -Compile/UseNinja = True - Paths/downloaddir = ${Variables:Root}\downloads + ShortPath/Enabled = False ShortPath/EnableJunctions = False -; Packager/RepositoryUrl = https://files.kde.org/craft/ -Packager/PackageType = NullsoftInstallerPackager -Packager/RepositoryUrl = https://files.kde.org/craft/master/ - -ContinuousIntegration/Enabled = True - ## 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. Compile/MakeProgram = jom +Compile/BuildType = RelWithDebInfo +Compile/UseNinja = True + +ContinuousIntegration/Enabled = False Packager/UseCache = ${Variables:UseCache} Packager/CreateCache = ${Variables:CreateCache} Packager/CacheDir = ${Variables:Root}\cache - -#CodeSigning/Enabled = ${Env:SIGN_PACKAGE} -#CodeSigning/Protected = True -#CodeSigning/Certificate = ${Env:CRAFT_CODESIGN_CERTIFICATE} -#CodeSigning/CommonName = -#CodeSigning/MacDeveloperId = ownCloud GmbH (4AP2STM4H5) -#CodeSigning/MacKeychainPath = sign-${Env:DRONE_BUILD_NUMBER}.keychain +Packager/RepositoryUrl = https://files.kde.org/craft/Qt5/ +Packager/PackageType = NullsoftInstallerPackager [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 +libs/qt.qtMajorVersion = 5 [windows-msvc2019_64-cl] -QtSDK/Compiler = msvc2019_64 -General/ABI = windows-msvc2019_64-cl [macos-64-clang] General/ABI = macos-64-clang -# Packager/PackageType = MacPkgPackager [macos-64-clang-debug] General/ABI = macos-64-clang @@ -80,4 +63,4 @@ Compile/BuildType = Debug [Env] CRAFT_CODESIGN_CERTIFICATE = -SIGN_PACKAGE = False \ No newline at end of file +SIGN_PACKAGE = False