From 86e06a2ae2ef6d239c2f9b58c7219191ef05aab3 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 15 Nov 2022 14:03:48 +0100 Subject: [PATCH 1/2] switch back to upstream craft Signed-off-by: Matthieu Gallien --- craftmaster.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/craftmaster.ini b/craftmaster.ini index 90b0e6e566..8693cf8a97 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -1,7 +1,7 @@ [General] Branch = master ShallowClone = True -CraftUrl = https://github.com/allexzander/craft.git +# CraftUrl = https://github.com/allexzander/craft.git # Variables defined here override the default value # The variable names are casesensitive From 23b8da319fe3265ff2beeccc61048856d12d9f90 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 15 Nov 2022 15:15:14 +0100 Subject: [PATCH 2/2] no need to install python that is already installed Signed-off-by: Matthieu Gallien --- .github/workflows/windows-build-and-test.yml | 2 +- craftmaster.ini | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml index 8ae1085ad7..a2f8b42c04 100644 --- a/.github/workflows/windows-build-and-test.yml +++ b/.github/workflows/windows-build-and-test.yml @@ -1,4 +1,4 @@ -name: Build and Test +name: Windows Build and Test on: push: branches: diff --git a/craftmaster.ini b/craftmaster.ini index 8693cf8a97..0c6616bb5c 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -45,6 +45,8 @@ 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