fix(autopatch): Rewrote config.yaml to remove obsolete actions. The c10s spec was already updated upstream to include '%if %{race}' wrap #3

Merged
eabdullin merged 2 commits from agent-fix/a10s-20260519-014503 into a10s 2026-05-19 11:03:59 +00:00
Owner

Automated fix by autopatch agent.

Summary: Rewrote config.yaml to remove obsolete actions. The c10s spec was already updated upstream to include '%if %{race}' wrappers and changed 'GOAMD64=v3' to 'GOAMD64=v1' for the amd64v1 tsan build, and replaced 'export GOAMD64=v3' with 'export GOAMD64=%{goamd64}'. Removed all obsolete actions that tried to add '%if %{race}' wrappers and dropped the 'export GOAMD64=v3' replacement. Updated CFLAGS GOAMD64 action from count:2 to count:1 (only one GOAMD64=v3 occurrence remains). Adapted from reference a10 branch config.

Root cause

The upstream c10s spec was significantly refactored: (1) '%global race 1' with riscv64 disable is now at the top of the spec, (2) the entire tsan/race build block is wrapped in '%if %{race}/%endif', (3) the second buildgo.sh call changed from GOAMD64=v3 to GOAMD64=v1 (for the amd64v1 binary), (4) all 'export GOAMD64=v3' lines replaced by 'export GOAMD64=%{goamd64}'. The old a10s config was trying to apply these changes as autopatch actions, but they were already present in the spec. The only remaining GOAMD64 action needed is to conditionalize the amd64v3 tsan buildgo.sh call for x86_64_v2 hosts, plus the go.env sed before %build.

Original error

Type: ActionNotAppliedError

Traceback (most recent call last):
  File "/root/autopatch-tool/src/webserv.py", line 77, in debrand_packages
    result = apply_modifications(
  File "/root/autopatch-tool/src/debranding.py", line 111, in apply_modifications
    config.apply_actions(rpms_working_dir + f"/{package}")
  File "/root/autopatch-tool/src/actions_handler.py", line 925, in apply_actions
    action.execute(Path(package_path))
  File "/root/autopatch-tool/src/actions_handler.py", line 472, in execute
    process_lines(
  File "/root/autopatch-tool/src/actions_handler.py", line 233, in process_lines
    raise ActionNotAppliedError(
actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['%ifarch x86_64', 'pushd "${tsan_go_dir}"', '  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh', 'popd', 'cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v3/race_linux.syso', '', 'pushd "${tsan_go_dir}"', '  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh', 'popd', 'cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v1/race_linux.syso', '', '%else', 'pushd "${tsan_go_dir}"', '  CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang ./buildgo.sh', 'popd', 'cp "${tsan_go_dir}"/race_linux_%{gohostarch}.syso ./src/runtime/race/race_linux_%{gohostarch}.syso', '%endif']' in /root/autopatch-tool/src/rpms-namespace/golang/golang.spec

Package: golang | Webhook branch: c10s

Automated fix by autopatch agent. **Summary:** Rewrote config.yaml to remove obsolete actions. The c10s spec was already updated upstream to include '%if %{race}' wrappers and changed 'GOAMD64=v3' to 'GOAMD64=v1' for the amd64v1 tsan build, and replaced 'export GOAMD64=v3' with 'export GOAMD64=%{goamd64}'. Removed all obsolete actions that tried to add '%if %{race}' wrappers and dropped the 'export GOAMD64=v3' replacement. Updated CFLAGS GOAMD64 action from count:2 to count:1 (only one GOAMD64=v3 occurrence remains). Adapted from reference a10 branch config. ### Root cause The upstream c10s spec was significantly refactored: (1) '%global race 1' with riscv64 disable is now at the top of the spec, (2) the entire tsan/race build block is wrapped in '%if %{race}/%endif', (3) the second buildgo.sh call changed from GOAMD64=v3 to GOAMD64=v1 (for the amd64v1 binary), (4) all 'export GOAMD64=v3' lines replaced by 'export GOAMD64=%{goamd64}'. The old a10s config was trying to apply these changes as autopatch actions, but they were already present in the spec. The only remaining GOAMD64 action needed is to conditionalize the amd64v3 tsan buildgo.sh call for x86_64_v2 hosts, plus the go.env sed before %build. ### Original error **Type:** `ActionNotAppliedError` ``` Traceback (most recent call last): File "/root/autopatch-tool/src/webserv.py", line 77, in debrand_packages result = apply_modifications( File "/root/autopatch-tool/src/debranding.py", line 111, in apply_modifications config.apply_actions(rpms_working_dir + f"/{package}") File "/root/autopatch-tool/src/actions_handler.py", line 925, in apply_actions action.execute(Path(package_path)) File "/root/autopatch-tool/src/actions_handler.py", line 472, in execute process_lines( File "/root/autopatch-tool/src/actions_handler.py", line 233, in process_lines raise ActionNotAppliedError( actions_handler.ActionNotAppliedError: Action 'ReplaceAction' was not applied successfully: No changes made for '['%ifarch x86_64', 'pushd "${tsan_go_dir}"', ' CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh', 'popd', 'cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v3/race_linux.syso', '', 'pushd "${tsan_go_dir}"', ' CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh', 'popd', 'cp "${tsan_go_dir}"/race_linux_amd64.syso ./src/runtime/race/internal/amd64v1/race_linux.syso', '', '%else', 'pushd "${tsan_go_dir}"', ' CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang ./buildgo.sh', 'popd', 'cp "${tsan_go_dir}"/race_linux_%{gohostarch}.syso ./src/runtime/race/race_linux_%{gohostarch}.syso', '%endif']' in /root/autopatch-tool/src/rpms-namespace/golang/golang.spec ``` --- Package: `golang` | Webhook branch: `c10s`
eabdullin added 1 commit 2026-05-19 01:45:04 +00:00
Rewrote config.yaml to remove obsolete actions. The c10s spec was already updated upstream to include '%if %{race}' wrappers and changed 'GOAMD64=v3' to 'GOAMD64=v1' for the amd64v1 tsan build, and re
eabdullin added 1 commit 2026-05-19 11:03:45 +00:00
eabdullin merged commit 87eb85f312 into a10s 2026-05-19 11:03:59 +00:00
eabdullin deleted branch agent-fix/a10s-20260519-014503 2026-05-19 11:03:59 +00:00
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: autopatch/golang#3
No description provided.