client-building icon indicating copy to clipboard operation
client-building copied to clipboard

build.bat failure at qtkeychain stage

Open TwiggyWan opened this issue 4 years ago • 0 comments

Hello, I follow build installations in the README of this repo inside the recommended virtual machine.

$ BUILD_INSTALLER=0 USE_CODE_SIGNING=0 UPLOAD_BUILD=0 ./build.bat Release

build stops at : win32 build of qtkeychain error: cannot pull with rebase: You have unstaged changes. error: please commit or stash them. "*** Build FAILED: qtkeychain Release Win32 (single-build-qtkeychain.bat)" "***** Build FAILED (build.bat)"

and indeed i have unstaged things that end up in qtkeychain directory :

`IEUser@MSEDGEWIN10 MINGW64 /c/Nextcloud/client-building/qtkeychain (master) $ git status On branch master Your branch is up to date with 'origin/master'.

Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: translations/qtkeychain_de.ts modified: translations/qtkeychain_fr.ts modified: translations/qtkeychain_ro.ts modified: translations/qtkeychain_ru.ts modified: translations/qtkeychain_zh.ts

Untracked files: (use "git add ..." to include in what will be committed) build/

no changes added to commit (use "git add" and/or "git commit -a") `

These are put in place by the win64 build that happens before the win32 build

I had to use git config rebase.autostash true to work around the problem. I suggest that the script that builds the win64 clean properly behind itself before starting win32 build.

TwiggyWan avatar Aug 23 '20 23:08 TwiggyWan