copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

CI: resolve merge conflict markers in build_release.yml
Some checks failed
Forgejo Release Builder / release (push) Failing after 17m24s
Details

Browse source 
Invalid YAML from leftover <<<<<<< / ======= / >>>>>>> markers broke
Forgejo Actions parsing. Keep fork delta, full changelog link, and tip block.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
littlecodedragon 2026-05-09 20:05:53 +02:00
parent fe43d3ef2c
commit b81d3eb198
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.forgejo/workflows/build_release.yml
View file

@ -402,9 +402,6 @@ jobs:
"- Assets use stable names for Obtainium compatibility." \ "- Assets use stable names for Obtainium compatibility." \
"- Versioned files follow: \`Komikku-v<version>-<abi>.apk\`." \ "- Versioned files follow: \`Komikku-v<version>-<abi>.apk\`." \
"" \ "" \
<<<<<<< HEAD
"${full_changelog}")"
=======
"${fork_delta_label}" \ "${fork_delta_label}" \
"" \ "" \
"${full_changelog}" \ "${full_changelog}" \
@ -413,7 +410,6 @@ jobs:
"> [!TIP]" \ "> [!TIP]" \
">" \ ">" \
"> ### If you are unsure which version to download then go with \`Komikku-universal.apk\`")" "> ### If you are unsure which version to download then go with \`Komikku-universal.apk\`")"
>>>>>>> c31f3fb7b8 (Release: use fork update source and upstream-based changelog delta)
"${JQ_BIN}" -n \ "${JQ_BIN}" -n \
--arg tag "${VERSION_TAG}" \ --arg tag "${VERSION_TAG}" \