[SES-42] add continue on error and qt5 branch

IONOS-Productivity · Jul 29, 2024 · 3650a7a · 3650a7a
1 parent 428bf1b
commit 3650a7a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/ionos-windows-build.yml b/.github/workflows/ionos-windows-build.yml
@@ -32,17 +32,18 @@ jobs:
         & "${{ github.workspace }}\.github\workflows\craft_setup.ps1" --setup
 
     - name: Craft unshelve
+      continue-on-error: true
       run: |
         & "${{ github.workspace }}\.github\workflows\craft_setup.ps1" -c --unshelve "${{ github.workspace }}\craft.shelf"
 
-    - name: Switch Craft to qt5-lts
-      run: |
-        & cd "${{ github.workspace }}\craft\${{ env.CRAFT_TARGET}}\etc\blueprints\locations\craft-blueprints-kde"
-        git checkout qt5-lts
+    # - name: Switch Craft to qt5-lts
+    #   run: |
+    #     & cd "${{ github.workspace }}\craft\${{ env.CRAFT_TARGET}}\etc\blueprints\locations\craft-blueprints-kde"
+    #     git checkout qt5-lts
 
-    - name: craft
-      run: |
-        & "${{ github.workspace }}\.github\workflows\craft_setup.ps1" -c craft
+    # - name: craft
+    #   run: |
+    #     & "${{ github.workspace }}\.github\workflows\craft_setup.ps1" -c craft
 
     # - name: print Debug filesystem
     #   run: |

diff --git a/craft.shelf b/craft.shelf
@@ -1,3 +1,3 @@
 [General]
 version = 2
-blueprintrepositories = https://github.com/EmilBohleber/nc-desktop-client-blueprints.git|qt5-lts|
+blueprintrepositories = https://github.com/EmilBohleber/nc-desktop-client-blueprints.git|qt5-lts|;https://invent.kde.org/packaging/craft-blueprints-kde.git|qt5-lts|