Skip to content

Commit 00cabd3

Browse files
MyroTkMyroTk
authored
Merge pull request #956 from Altinity/remove-tidy
Antalya 25.6 remove tidy build job
2 parents f9a9a99 + 9138e1d commit 00cabd3

File tree

4 files changed

+17
-143
lines changed

4 files changed

+17
-143
lines changed

‎.github/workflows/master.yml‎

Lines changed: 11 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -202,47 +202,6 @@ jobs:
202202
python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
203203
fi
204204
205-
build_amd_tidy:
206-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
207-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
208-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90aWR5KQ==') }}
209-
name: "Build (amd_tidy)"
210-
outputs:
211-
data: ${{ steps.run.outputs.DATA }}
212-
steps:
213-
- name: Checkout code
214-
uses: actions/checkout@v4
215-
with:
216-
ref: ${{ env.CHECKOUT_REF }}
217-
218-
- name: Setup
219-
uses: ./.github/actions/runner_setup
220-
221-
- name: Prepare env script
222-
run: |
223-
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
224-
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
225-
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
226-
export PYTHONPATH=./ci:.:
227-
cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
228-
${{ needs.config_workflow.outputs.data }}
229-
EOF
230-
cat > ./ci/tmp/workflow_status.json << 'EOF'
231-
${{ toJson(needs) }}
232-
EOF
233-
ENV_SETUP_SCRIPT_EOF
234-
235-
- name: Run
236-
id: run
237-
run: |
238-
. ./ci/tmp/praktika_setup_env.sh
239-
set -o pipefail
240-
if command -v ts &> /dev/null; then
241-
python3 -m praktika run 'Build (amd_tidy)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
242-
else
243-
python3 -m praktika run 'Build (amd_tidy)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
244-
fi
245-
246205
build_amd_debug:
247206
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
248207
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
@@ -655,7 +614,7 @@ jobs:
655614
656615
build_amd_darwin:
657616
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
658-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
617+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
659618
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kYXJ3aW4p') }}
660619
name: "Build (amd_darwin)"
661620
outputs:
@@ -696,7 +655,7 @@ jobs:
696655
697656
build_arm_darwin:
698657
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
699-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
658+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
700659
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9kYXJ3aW4p') }}
701660
name: "Build (arm_darwin)"
702661
outputs:
@@ -737,7 +696,7 @@ jobs:
737696
738697
build_arm_v80compat:
739698
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
740-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
699+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
741700
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV92ODBjb21wYXQp') }}
742701
name: "Build (arm_v80compat)"
743702
outputs:
@@ -778,7 +737,7 @@ jobs:
778737
779738
build_amd_freebsd:
780739
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
781-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
740+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
782741
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9mcmVlYnNkKQ==') }}
783742
name: "Build (amd_freebsd)"
784743
outputs:
@@ -819,7 +778,7 @@ jobs:
819778
820779
build_ppc64le:
821780
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
822-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
781+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
823782
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHBwYzY0bGUp') }}
824783
name: "Build (ppc64le)"
825784
outputs:
@@ -860,7 +819,7 @@ jobs:
860819
861820
build_amd_compat:
862821
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
863-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
822+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
864823
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
865824
name: "Build (amd_compat)"
866825
outputs:
@@ -901,7 +860,7 @@ jobs:
901860
902861
build_amd_musl:
903862
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
904-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
863+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
905864
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tdXNsKQ==') }}
906865
name: "Build (amd_musl)"
907866
outputs:
@@ -942,7 +901,7 @@ jobs:
942901
943902
build_riscv64:
944903
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
945-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
904+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
946905
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHJpc2N2NjQp') }}
947906
name: "Build (riscv64)"
948907
outputs:
@@ -983,7 +942,7 @@ jobs:
983942
984943
build_s390x:
985944
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
986-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
945+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
987946
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHMzOTB4KQ==') }}
988947
name: "Build (s390x)"
989948
outputs:
@@ -1024,7 +983,7 @@ jobs:
1024983
1025984
build_loongarch64:
1026985
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
1027-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
986+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
1028987
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGxvb25nYXJjaDY0KQ==') }}
1029988
name: "Build (loongarch64)"
1030989
outputs:
@@ -1065,7 +1024,7 @@ jobs:
10651024
10661025
build_fuzzers:
10671026
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
1068-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
1027+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
10691028
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGZ1enplcnMp') }}
10701029
name: "Build (fuzzers)"
10711030
outputs:
@@ -4296,7 +4255,6 @@ jobs:
42964255
- dockers_build_amd
42974256
- dockers_build_arm
42984257
- dockers_build_multiplatform_manifest
4299-
- build_amd_tidy
43004258
- build_amd_debug
43014259
- build_amd_release
43024260
- build_amd_asan

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -163,88 +163,6 @@ jobs:
163163
python3 -m praktika run 'Dockers Build (arm)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
164164
fi
165165
166-
build_amd_tidy:
167-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
168-
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
169-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90aWR5KQ==') }}
170-
name: "Build (amd_tidy)"
171-
outputs:
172-
data: ${{ steps.run.outputs.DATA }}
173-
steps:
174-
- name: Checkout code
175-
uses: actions/checkout@v4
176-
with:
177-
ref: ${{ env.CHECKOUT_REF }}
178-
179-
- name: Setup
180-
uses: ./.github/actions/runner_setup
181-
182-
- name: Prepare env script
183-
run: |
184-
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
185-
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
186-
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
187-
export PYTHONPATH=./ci:.:
188-
cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
189-
${{ needs.config_workflow.outputs.data }}
190-
EOF
191-
cat > ./ci/tmp/workflow_status.json << 'EOF'
192-
${{ toJson(needs) }}
193-
EOF
194-
ENV_SETUP_SCRIPT_EOF
195-
196-
- name: Run
197-
id: run
198-
run: |
199-
. ./ci/tmp/praktika_setup_env.sh
200-
set -o pipefail
201-
if command -v ts &> /dev/null; then
202-
python3 -m praktika run 'Build (amd_tidy)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
203-
else
204-
python3 -m praktika run 'Build (amd_tidy)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
205-
fi
206-
207-
build_arm_tidy:
208-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
209-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tidy]
210-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV90aWR5KQ==') }}
211-
name: "Build (arm_tidy)"
212-
outputs:
213-
data: ${{ steps.run.outputs.DATA }}
214-
steps:
215-
- name: Checkout code
216-
uses: actions/checkout@v4
217-
with:
218-
ref: ${{ env.CHECKOUT_REF }}
219-
220-
- name: Setup
221-
uses: ./.github/actions/runner_setup
222-
223-
- name: Prepare env script
224-
run: |
225-
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
226-
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
227-
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
228-
export PYTHONPATH=./ci:.:
229-
cat > ./ci/tmp/workflow_config_pr.json << 'EOF'
230-
${{ needs.config_workflow.outputs.data }}
231-
EOF
232-
cat > ./ci/tmp/workflow_status.json << 'EOF'
233-
${{ toJson(needs) }}
234-
EOF
235-
ENV_SETUP_SCRIPT_EOF
236-
237-
- name: Run
238-
id: run
239-
run: |
240-
. ./ci/tmp/praktika_setup_env.sh
241-
set -o pipefail
242-
if command -v ts &> /dev/null; then
243-
python3 -m praktika run 'Build (arm_tidy)' --workflow "PR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
244-
else
245-
python3 -m praktika run 'Build (arm_tidy)' --workflow "PR" --ci |& tee ./ci/tmp/job.log
246-
fi
247-
248166
build_amd_debug:
249167
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
250168
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
@@ -2174,7 +2092,7 @@ jobs:
21742092
21752093
bugfix_validation_integration_tests:
21762094
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
2177-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_tidy, build_amd_debug]
2095+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_debug]
21782096
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVnZml4IHZhbGlkYXRpb24gKGludGVncmF0aW9uIHRlc3RzKQ==') }}
21792097
name: "Bugfix validation (integration tests)"
21802098
outputs:
@@ -3723,8 +3641,6 @@ jobs:
37233641
- config_workflow
37243642
- dockers_build_amd
37253643
- dockers_build_arm
3726-
- build_amd_tidy
3727-
- build_arm_tidy
37283644
- build_amd_debug
37293645
- build_amd_release
37303646
- build_amd_asan

‎ci/workflows/master.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
event=Workflow.Event.PUSH,
1414
branches=[BASE_BRANCH, "releases/*", "antalya-*"],
1515
jobs=[
16-
*JobConfigs.tidy_build_jobs,
16+
# *JobConfigs.tidy_build_jobs, # NOTE (strtgbb): we don't run tidy build jobs
1717
*JobConfigs.build_jobs,
1818
*[
1919
job.set_dependency(
20-
REGULAR_BUILD_NAMES + [JobConfigs.tidy_build_jobs[0].name]
20+
REGULAR_BUILD_NAMES # + [JobConfigs.tidy_build_jobs[0].name] # NOTE (strtgbb): we don't run tidy build jobs
2121
)
2222
for job in JobConfigs.special_build_jobs
2323
],

‎ci/workflows/pull_request.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# JobConfigs.style_check, # NOTE (strtgbb): we don't run style check
1919
# JobConfigs.docs_job, # NOTE (strtgbb): we don't build docs
2020
# JobConfigs.fast_test, # NOTE (strtgbb): same fails as stateless tests, revisit later
21-
*JobConfigs.tidy_build_jobs,
22-
*JobConfigs.tidy_arm_build_jobs,
21+
# *JobConfigs.tidy_build_jobs, # NOTE (strtgbb): we don't run tidy build jobs
22+
# *JobConfigs.tidy_arm_build_jobs,
2323
*[
2424
job.set_dependency(
2525
[
@@ -49,7 +49,7 @@
4949
[
5050
# JobNames.STYLE_CHECK, # NOTE (strtgbb): we don't run style check
5151
# JobNames.FAST_TEST, # NOTE (strtgbb): we don't run fast tests
52-
JobConfigs.tidy_build_jobs[0].name,
52+
# JobConfigs.tidy_build_jobs[0].name, # NOTE (strtgbb): we don't run tidy build jobs
5353
]
5454
),
5555
JobConfigs.bugfix_validation_ft_pr_job,

0 commit comments

Comments
 (0)