Skip to content

Commit

Permalink
update the selected python3 version
Browse files Browse the repository at this point in the history
Signed-off-by: Matthieu Gallien <[email protected]>
  • Loading branch information
mgallien committed Nov 22, 2023
1 parent 219823f commit ede9c85
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 29 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/windows-build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -28,7 +28,8 @@ jobs:
python "${{ env.CRAFT_MASTER_LOCATION }}\CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c $args
if($LASTEXITCODE -ne 0) {exit $LASTEXITCODE}
}
craft --set version=dev craft-core craft-blueprints-kde
craft --add-blueprint-repository [git]https://github.com/nextcloud/desktop-client-blueprints.git
craft craft
craft --install-deps nextcloud-client
Expand Down
37 changes: 10 additions & 27 deletions craftmaster.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -80,4 +63,4 @@ Compile/BuildType = Debug

[Env]
CRAFT_CODESIGN_CERTIFICATE =
SIGN_PACKAGE = False
SIGN_PACKAGE = False

0 comments on commit ede9c85

Please sign in to comment.