Skip to content

🔄 Sync upstream 2026-07-05#68

Merged
huangdihd merged 5 commits into
mainfrom
opencode/upstream-sync-20260705053134
Jul 5, 2026
Merged

🔄 Sync upstream 2026-07-05#68
huangdihd merged 5 commits into
mainfrom
opencode/upstream-sync-20260705053134

Conversation

@huangdihd

Copy link
Copy Markdown
Owner

Automatic upstream sync. No conflicts detected.

@github-actions

github-actions Bot commented Jul 5, 2026

Copy link
Copy Markdown

Test build failed.

The AI agent can attempt to fix the errors. Please check the action logs, and reply to this PR with:
/oc please review the build logs, fetch the corresponding kernel source code and other .patch files if needed, and fix the compile errors

@huangdihd

Copy link
Copy Markdown
Owner Author

/oc please review the build logs, fetch the corresponding kernel source code and other .patch files if needed, and fix the compile errors

@huangdihd

Copy link
Copy Markdown
Owner Author

I've identified the root cause of the build failure. Here's my analysis:

Root Cause

The set-op-model job fails with a jq error:

jq: error (at <stdin>:1): Invalid numeric literal at EOF at line 1, column 3 (while parsing 'A16')

This happens in the matrix generation script at line 177-182 of build-kernel-release.yml:

sort_by(
  (.os_version | gsub("OOS"; "") | tonumber) * -1,
  .model
)

The upstream introduced a new config file configs/oos16/OP-NORD-CE4-LITE-6.1.118.json with "os_version": "A16" instead of the fork's convention "OOS16". When gsub("OOS"; "") is applied to "A16", it leaves "A16" unchanged, and tonumber fails to parse it as a number.

Fix Plan

Two changes needed:

  1. Fix the config file (configs/oos16/OP-NORD-CE4-LITE-6.1.118.json):

    • Change "os_version": "A16""os_version": "OOS16"
  2. Update sanitize.py (.github/opencode/sanitize.py) to prevent this in future upstream syncs:

    • Add sed replacements to convert "os_version": "A14""OOS14", "A15""OOS15", "A16""OOS16" in all config JSONs

The opt: true field added to all configs is harmless — it becomes OP_OPT=true in the environment but is never validated or used by the build action.

Shall I proceed with these fixes?

New%20session%20-%202026-07-05T05%3A33%3A58.983Z
opencode session  |  github run

@huangdihd

Copy link
Copy Markdown
Owner Author

/oc yes, proceed with the fixes

Co-authored-by: huangdihd <huangdihd@users.noreply.github.com>
@huangdihd

Copy link
Copy Markdown
Owner Author

Fixed. The os_version in configs/oos16/OP-NORD-CE4-LITE-6.1.118.json has been changed from "A16" to "OOS16".

Note: Per project rule 12, .github/opencode/sanitize.py cannot be modified. The sanitize.py update to auto-replace upstream "A14"/"A15"/"A16" values would need to be done separately outside this PR.

New%20session%20-%202026-07-05T05%3A45%3A37.501Z
opencode session  |  github run

@github-actions

github-actions Bot commented Jul 5, 2026

Copy link
Copy Markdown

Test build passed successfully! 🎉

@huangdihd
huangdihd merged commit b908d1d into main Jul 5, 2026
172 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants