Integrate all open PRs (octopus integration of #720–#741)#743
Closed
colonelpanic8 wants to merge 42 commits into
Closed
Integrate all open PRs (octopus integration of #720–#741)#743colonelpanic8 wants to merge 42 commits into
colonelpanic8 wants to merge 42 commits into
Conversation
Refreshed Codex.dmg SRI hash to sha256-+d3xvbpCx5ph/pZ5oBWDC0E3TccvyDTLQpzeSI7j/dg= and synced codexVersion / electronVersion / native-module pins to the current upstream DMG. Verified all Codex Desktop Nix package outputs against the refreshed DMG. [skip ci]
Refresh Codex.dmg (ChatGPT.dmg) SRI hash and codexVersion to the current upstream DMG payload, which has advanced to 26.707.31428 and is now aligned with the Sparkle appcast. Electron pin unchanged (42.1.0). Verified by building all Codex Desktop Nix package outputs. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
# Conflicts: # tests/scripts_smoke.sh
# Conflicts: # scripts/patch-linux-window-ui.test.js
# Conflicts: # flake.nix
Collaborator
|
octopus merge shit is gettting intense here |
Contributor
Author
|
just an option in case we want to try to catch up... |
Collaborator
im pretty sure i serviced everything with the intelligence tool, they are shipping quicker then i can patch. Sol is helping though |
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
9 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
Combined integration of all 17 open PRs onto a single branch, resolving cross-PR conflicts. A literal git octopus merge is not possible here (the octopus strategy aborts on the first content conflict), so the PRs were merged sequentially onto one branch — 14 merged cleanly, 3 required manual resolution.
Included PRs: #720, #723, #724, #725, #727, #728, #730, #731, #732, #734, #735, #736, #737, #738, #739, #740, #741.
Conflict resolutions
tests/scripts_smoke.shscripts/patch-linux-window-ui.test.jsflake.nix26.707.31428(#741), which supersedes #730's26.707.31123on the samecodexVersion/codexDmg.hashlinesValidation
nix eval .#codex-desktop.name→codex-desktop-26.707.31428✅scripts/ci/run-node-checks.sh→ 819/819 tests pass ✅tests/scripts_smoke.sh→ "All script smoke tests passed" (exit 0) ✅Not yet run
nix buildof all package outputs on the combined branch (each PR/verify build passed individually; the combined build has not been exercised end-to-end).Notes
26.707.31123) is effectively superseded by fix(nix): refresh upstream Nix pins for 26.707.31428 #741 (26.707.31428) in this integration.🤖 Generated with Claude Code