From 3bc9a83c9e37c2035d050e7e0e759bae700cdf2a Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Tue, 22 Apr 2025 11:50:23 +0200 Subject: [PATCH 1/2] ci: temporarily use custom craftmaster fork this is required to make `General`.`CraftRevision` work as intended. Revert this after https://invent.kde.org/packaging/craftmaster/-/merge_requests/7 is merged. Signed-off-by: Jyrki Gadinger --- .github/workflows/macos-build-and-test.yml | 2 +- .github/workflows/windows-build-and-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml index f6c59d4910f06..6f4fd7520f2ea 100644 --- a/.github/workflows/macos-build-and-test.yml +++ b/.github/workflows/macos-build-and-test.yml @@ -46,7 +46,7 @@ jobs: - name: Download Craft run: | - git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} + git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} - name: Add Nextcloud client blueprints run: | diff --git a/.github/workflows/windows-build-and-test.yml b/.github/workflows/windows-build-and-test.yml index 2aa869326675b..6bfc44d7e7a1a 100644 --- a/.github/workflows/windows-build-and-test.yml +++ b/.github/workflows/windows-build-and-test.yml @@ -22,7 +22,7 @@ jobs: - name: Install Craft Master with Nextcloud Client Deps shell: pwsh run: | - & cmd /C "git clone -q --depth=1 https://invent.kde.org/packaging/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1" + & cmd /C "git clone -q --depth=1 https://invent.kde.org/ggadinger/craftmaster.git ${{ env.CRAFT_MASTER_LOCATION }} 2>&1" function craft() { python "${{ env.CRAFT_MASTER_LOCATION }}\CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c $args From 7e278bd1af0c50f09c01690789904bf9e0ffe566 Mon Sep 17 00:00:00 2001 From: Jyrki Gadinger Date: Tue, 22 Apr 2025 11:54:26 +0200 Subject: [PATCH 2/2] ci: pin craft revision to a specific commit 25.03-nc still has pkg-config in it, which recently got replaced in Craft by pkgconf Signed-off-by: Jyrki Gadinger --- craftmaster.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/craftmaster.ini b/craftmaster.ini index bde34074ccc16..a201df5fa332e 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -1,7 +1,8 @@ [General] Branch = master -ShallowClone = True # CraftUrl = https://github.com/allexzander/craft.git +CraftRevision = ec08a9becf7f7749c0d39282561ba5468b80d5e6 +ShallowClone = False # Variables defined here override the default value # The variable names are casesensitive