From 04b050a362e70feb4a7ceed5d105137bc92be6cd Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Wed, 17 Jun 2026 15:24:10 +0545 Subject: [PATCH 1/6] build: unpin craft-core Signed-off-by: Saw-jan --- .craft.shelf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.craft.shelf b/.craft.shelf index c3efed667f..ae4e178e2d 100644 --- a/.craft.shelf +++ b/.craft.shelf @@ -13,10 +13,6 @@ revision = 26586a9e9 version = main revision = 09c0c94d067b696e70f99e80640c0407e17c85f2 -[craft/craft-core] -version = master -revision = b3c1e0d20a760afa7d00729dab4a5f29c30e6cd0 - [dev-utils/7zip-base] version = 25.00 From a8e8c6e8f040c4e1166fd8fd487ec0726c65dfc3 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 16 Jun 2026 11:21:09 +0200 Subject: [PATCH 2/6] CI: Pin the Visual Studio release --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index da6a7535a8..9e624b65d1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: matrix: include: - target: windows-cl-msvc2022-x86_64 - os: windows-latest + os: windows-2022 container: - target: macos-clang-arm64 os: macos-latest From 0e21069479134a56bd70590b59930d05bba5178c Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 16 Jun 2026 12:25:23 +0200 Subject: [PATCH 3/6] CI: Powershell enable exit code handling --- .github/workflows/.craft.ps1 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/.craft.ps1 b/.github/workflows/.craft.ps1 index bc7639e703..b3b5552589 100644 --- a/.github/workflows/.craft.ps1 +++ b/.github/workflows/.craft.ps1 @@ -1,3 +1,7 @@ +# enable handling of exit codes in powershell +$PSNativeCommandUseErrorActionPreference=$true + +# define which python to use if ($IsWindows) { $python = (Get-Command py).Source $python=(py -c "import sys; print(sys.executable)") From 7d8ba5baf6b68f93980d623fe8fd47993ffdaadc Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Tue, 16 Jun 2026 13:02:40 +0200 Subject: [PATCH 4/6] Ci: Update appimage docker image to alma9 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9e624b65d1..24b75e57bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: container: - target: linux-gcc-x86_64 os: ubuntu-latest - container: ghcr.io/opencloud-eu/ci-docker-desktop/appimage:latest + container: invent-registry.kde.org/sysadmin/ci-images/craft-appimage-alma9:latest name: ${{ matrix.target }} From 4a701cbefb70532e8e68a639c6b0acb0a97c8d26 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Wed, 17 Jun 2026 10:27:39 +0200 Subject: [PATCH 5/6] Ci: install curently missing 'file' command --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24b75e57bf..cbb6958a05 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,6 +125,8 @@ jobs: & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/nsis } elseif($IsLinux) { & "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/linuxdeploy + # ensure we have fuse3-devel installed + dnf install -y fuse3-devel file } - name: Install dependencies From acb689217a0b3c5b23821d649bd26e83cf1f099c Mon Sep 17 00:00:00 2001 From: Saw-jan Date: Wed, 17 Jun 2026 15:34:26 +0545 Subject: [PATCH 6/6] build: unpin 7zip Signed-off-by: Saw-jan --- .craft.shelf | 3 --- 1 file changed, 3 deletions(-) diff --git a/.craft.shelf b/.craft.shelf index ae4e178e2d..016016b8eb 100644 --- a/.craft.shelf +++ b/.craft.shelf @@ -13,9 +13,6 @@ revision = 26586a9e9 version = main revision = 09c0c94d067b696e70f99e80640c0407e17c85f2 -[dev-utils/7zip-base] -version = 25.00 - [dev-utils/cmake] version = latest