Re: KDE Gear projects with failing CI (master + stable) (7 April 2026)
Ben Cooksley <[email protected]> Wed, 8 Apr 2026 22:19:05 +1200
| Newsgroups | gmane.comp.kde.devel.general |
|---|---|
| Message-ID | <CA+XidOGo68sjO3xfS+BcEOELwpX8FH4BUoEep3n+6C323W2U8Q@mail.gmail.com> |
On Wed, Apr 8, 2026 at 1:15 PM Ben Cooksley <[email protected]> wrote: > On Wed, Apr 8, 2026 at 8:30 AM Albert Vaca Cintora <[email protected]> > wrote: > >> The error in Craft Windows happens when it tries to `git pull` Craft >> itself, with this log: >> >> Your branch and 'origin/master' have diverged, >> and have 1 and 1 different commits each, respectively. >> (use "git pull" if you want to integrate the remote branch with yours) >> executing command: executing command: [WindowsPath('C:/Program >> Files/Git/cmd/git.exe'), 'merge'] >> >> ================================================================================ >> fatal: refusing to merge unrelated histories >> >> It seems that the runners' local Craft clone contains different commits >> than upstream. It requires manually resetting the local clone. Was the >> Craft git history rewritten recently? >> > > Not to my knowledge, and rewriting history requires opening certain gates. > > I'm more inclined to think something within Craft is causing patches and > commits to be made to the repository automatically. > > I've triggered a Windows image build now which will hopefully resolve the > issue as this clone is burned into the VM image. > See https://invent.kde.org/sysadmin/ci-images/-/jobs/4252235 > It appears to have fixed the issue. > > Cheers, > Ben > Thanks, Ben > > >> >> Albert >> >> On Tue, Apr 7, 2026 at 5:49 PM Albert Astals Cid <[email protected]> wrote: >> >>> Please work on fixing them, otherwise i will remove the failing CI jobs >>> on >>> their 4th failing week, it is very important that CI is passing for >>> multiple >>> reasons. >>> >>> VERY BAD NEWS: ktorrent flatpak was removed from stable because it >>> failed to >>> build for 4 consecutive weeks >>> >>> >>> Good news: 2 repo fixed >>> >>> Bad news: 5 repo started failing, 1 keeps failing >>> >>> >>> kontact - 2nd week >>> * https://invent.kde.org/pim/kontact/-/pipelines/1208678 >>> * craft windows: compiler is out of heap space >>> >>> >>> neochat - NEW >>> * https://invent.kde.org/network/neochat/-/pipelines/1208034 >>> * qmllint fails on Qt 6.12 ? >>> >>> >>> alligator - NEW >>> * https://invent.kde.org/network/alligator/-/pipelines/1209127 >>> * detects leak in PlasmaDesktopTheme/QFontDatabase/fontconfig ? >>> >>> >>> Dragon - NEW >>> * https://invent.kde.org/multimedia/dragon/-/pipelines/1208662 >>> * Qt 6.12 fails to compile >>> >>> >>> krdc - NEW >>> * https://invent.kde.org/network/krdc/-/pipelines/1208455 >>> * flatpak fails >>> * libssh fails to download >>> * reported at >>> https://gitlab.com/libssh/libssh-mirror/-/work_items/366 >>> >>> >>> libktorrent - NEW >>> * https://invent.kde.org/network/libktorrent/-/pipelines/1207126 >>> * https://invent.kde.org/network/libktorrent/-/pipelines/1207110 >>> (stable) >>> * "Known" openssl leak on Qt 6.12 >>> >>> >>> Something weird is happening with Craft Windows - NEW >>> * https://invent.kde.org/education/minuet/-/pipelines/1209343 >>> * https://invent.kde.org/network/kdeconnect-kde/-/pipelines/1209413 >>> * https://invent.kde.org/multimedia/kdenlive/-/pipelines/1209354 >>> * https://invent.kde.org/games/palapeli/-/pipelines/1209323 >>> * https://invent.kde.org/games/picmi/-/pipelines/1209324 >>> * https://invent.kde.org/sdk/kapptemplate/-/pipelines/1209505 >>> >>> Cheers, >>> Albert >>> >>> >>>