chore: sync develop onto main after accidental main merges - #464
Merged
Conversation
* feat: add multi-platform green portable packaging Ship relocatable Octop-<plat>.zip via scripts/green (portable CPython, frozen uv.lock deps, Windows pywin32 DLL fix) and octop-portable.yml. No OOB overlay or product trimming; first run uses upstream setup. Co-authored-by: Harry <forcemeter@users.noreply.github.com> * feat(desktop): Wails v3 shell with green portable under ~/.octop Move green packaging to desktop/portable, add a Wails v3 client that downloads Octop-<plat>.zip, spawns launch.py with OCTOP_HOME=~/.octop, and exposes locale/theme/autostart/tray/macOS caffeinate settings. Green upgrades install into packages via OCTOP_GREEN_PACKAGES. Co-authored-by: Harry <forcemeter@users.noreply.github.com> * fix(desktop): add Wails v3 Taskfile and build/config.yml wails3 build/dev look for Taskfile.yml and build/config.yml in desktop/src. Un-ignore that tree from the repo-wide build/ gitignore. Co-authored-by: Harry <forcemeter@users.noreply.github.com> * 初始化桌面客户端 * add drag and toggle * add prevent sleep * update * change dock icon * clean package/useless files * add Attach zips to GitHub Release * pack file into windows bin-file * Packages a production app * chanage workflow name * chanage workflow name * linux package in single ifle * linux package in single ifle * 在浏览器中打开_blank 的链接 * upgrade python to 3.12 --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: Harry <forcemeter@users.noreply.github.com> Co-authored-by: 杨树海 <yangshuhai@pdnews.cn>
Auto Tag dispatches Octop Desktop with Release/Docker. Restrict octop-desktop.yml to v* tags + workflow_dispatch only. Co-authored-by: jubaoliang <jubaoliang@tencent.com>
huangcheng
added a commit
to huangcheng/Octop
that referenced
this pull request
Aug 27, 2026
Merge upstream/develop (TencentCloud#464 sync); combine [Unreleased] OAuth entry with CI/Docker and schema v10 repair notes. Align migrate.py with upstream.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
main的变更同步回develop，使main重新成为develop的祖先#462feat(desktop) Octop 桌面客户端、#463ci cascade desktop package.github/workflows/auto-tag-on-release.yml注释：保留 develop 侧更完整的 FnOS + Desktop 说明Test plan
git merge-base --is-ancestor origin/main origin/develop为真Made with Cursor