Merge pull request 'fix(autopatch): Rewrote config.yaml to remove obsolete actions. The c10s spec was already updated upstream to include '%if %{race}' wrap' (#3) from agent-fix/a10s-20260519-014503 into a10s
Reviewed-on: #3
This commit is contained in:
commit
87eb85f312
139
config.yaml
139
config.yaml
@ -2,128 +2,15 @@ actions:
|
||||
- replace:
|
||||
- target: "spec"
|
||||
find: |
|
||||
%build
|
||||
%global goamd64 v3
|
||||
%global goppc64 power9
|
||||
replace: |
|
||||
%ifarch x86_64_v2
|
||||
sed -i 's/^GOAMD64=v3$/GOAMD64=v2/' ./go.env
|
||||
grep -q '^GOAMD64=v2$' ./go.env
|
||||
%endif
|
||||
|
||||
%build
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: |
|
||||
%global fail_on_tests 1
|
||||
replace: |
|
||||
%global fail_on_tests 1
|
||||
|
||||
%global race 1
|
||||
%ifarch riscv64
|
||||
%global race 0
|
||||
%endif
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: |
|
||||
%package race
|
||||
Summary: Race detetector library object files.
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description race
|
||||
Binary library objects for Go's race detector.
|
||||
replace: |
|
||||
%if %{race}
|
||||
%package race
|
||||
Summary: Race detetector library object files.
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description race
|
||||
Binary library objects for Go's race detector.
|
||||
%endif
|
||||
count: 1
|
||||
find: |
|
||||
%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
|
||||
|
||||
%global goamd64 v2
|
||||
%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
|
||||
replace: |
|
||||
%if %{race}
|
||||
%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
|
||||
%endif
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: |
|
||||
GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race std
|
||||
replace: |
|
||||
%if %{race}
|
||||
GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race std
|
||||
%endif
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: |
|
||||
%ifarch x86_64
|
||||
%exclude %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso
|
||||
%exclude %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso
|
||||
%else
|
||||
%exclude %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso
|
||||
%endif
|
||||
replace: |
|
||||
%if %{race}
|
||||
%ifarch x86_64
|
||||
%exclude %{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso
|
||||
%exclude %{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso
|
||||
%else
|
||||
%exclude %{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso
|
||||
%endif
|
||||
%endif
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: |
|
||||
%files race
|
||||
%ifarch x86_64
|
||||
%{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso
|
||||
%{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso
|
||||
%else
|
||||
%{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso
|
||||
%endif
|
||||
replace: |
|
||||
%if %{race}
|
||||
%files race
|
||||
%ifarch x86_64
|
||||
%{goroot}/src/runtime/race/internal/amd64v1/race_linux.syso
|
||||
%{goroot}/src/runtime/race/internal/amd64v3/race_linux.syso
|
||||
%else
|
||||
%{goroot}/src/runtime/race/race_linux_%{gohostarch}.syso
|
||||
%endif
|
||||
%global goamd64 v3
|
||||
%endif
|
||||
%global goppc64 power9
|
||||
count: 1
|
||||
- target: "spec"
|
||||
find: |
|
||||
@ -134,18 +21,8 @@ actions:
|
||||
%else
|
||||
CFLAGS="%{tsan_buildflags} %{tsan_optflag}" CC=clang GOAMD64=v3 ./buildgo.sh
|
||||
%endif
|
||||
count: 2
|
||||
- target: "spec"
|
||||
find: |
|
||||
export GOAMD64=v3
|
||||
replace: |
|
||||
%ifarch x86_64_v2
|
||||
export GOAMD64=v2
|
||||
%else
|
||||
export GOAMD64=v3
|
||||
%endif
|
||||
count: -1
|
||||
|
||||
count: 1
|
||||
|
||||
|
||||
- modify_release:
|
||||
- suffix: ".alma.1"
|
||||
@ -155,5 +32,5 @@ actions:
|
||||
- name: "Eduard Abdullin"
|
||||
email: "eabdullin@almalinux.org"
|
||||
line:
|
||||
- "Update env var for v2"
|
||||
- "Add x86_64_v2 support"
|
||||
- "Disable race for riscv64"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user