Skip to content

Commit d8304d7

Browse files
sunmou99sunmou99
authored
Don't report test error if it's indeed build errors (#861)
1 parent cda77f0 commit d8304d7

File tree

2 files changed

+34
-30
lines changed

2 files changed

+34
-30
lines changed

‎.github/workflows/cpp-packaging.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ jobs:
755755
trigger_integration_tests:
756756
# Trigger the integration_tests workflow.
757757
needs: [merge_packages, download_sdk_package, cleanup_packaging_artifacts]
758-
if: (github.event.inputs.skipIntegrationTests == 0 || github.event.inputs.skipIntegrationTests == '') && !cancelled()
758+
if: (github.event.inputs.skipIntegrationTests == 0 || github.event.inputs.skipIntegrationTests == '') && !cancelled() && !failure()
759759
runs-on: ubuntu-latest
760760
steps:
761761
- name: Checkout repo

‎.github/workflows/integration_tests.yml

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -348,14 +348,14 @@ jobs:
348348
echo "__SUMMARY_MISSING__" > build-results-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}.log.json
349349
fi
350350
- name: Upload Desktop integration tests artifact
351-
uses: actions/upload-artifact@v2.2.2
351+
uses: actions/upload-artifact@v3
352352
if: ${{ !cancelled() }}
353353
with:
354354
name: testapps-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}
355355
path: testapps-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}
356356
retention-days: ${{ env.artifactRetentionDays }}
357357
- name: Upload Desktop build results artifact
358-
uses: actions/upload-artifact@v2.2.2
358+
uses: actions/upload-artifact@v3
359359
if: ${{ !cancelled() }}
360360
with:
361361
name: log-artifact
@@ -379,7 +379,7 @@ jobs:
379379
python scripts/gha/gcs_uploader.py --testapp_dir ta --key_file scripts/gha-encrypted/gcs_key_file.json
380380
- name: Download log artifacts
381381
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
382-
uses: actions/download-artifact@v2.0.8
382+
uses: actions/download-artifact@v3
383383
with:
384384
path: test_results
385385
name: log-artifact
@@ -494,22 +494,22 @@ jobs:
494494
echo "__SUMMARY_MISSING__" > build-results-android-${{ matrix.os }}.log.json
495495
fi
496496
- name: Upload Android integration tests artifact
497-
uses: actions/upload-artifact@v2.2.2
497+
uses: actions/upload-artifact@v3
498498
if: ${{ !cancelled() }}
499499
with:
500500
name: testapps-android-${{ matrix.os }}
501501
path: testapps-android-${{ matrix.os }}
502502
retention-days: ${{ env.artifactRetentionDays }}
503503
- name: Upload Android build results artifact
504-
uses: actions/upload-artifact@v2.2.2
504+
uses: actions/upload-artifact@v3
505505
if: ${{ !cancelled() }}
506506
with:
507507
name: log-artifact
508508
path: build-results-android-${{ matrix.os }}*
509509
retention-days: ${{ env.artifactRetentionDays }}
510510
- name: Download log artifacts
511511
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
512-
uses: actions/download-artifact@v2.0.8
512+
uses: actions/download-artifact@v3
513513
with:
514514
path: test_results
515515
name: log-artifact
@@ -611,22 +611,22 @@ jobs:
611611
echo "__SUMMARY_MISSING__" > build-results-ios-macos-latest.log.json
612612
fi
613613
- name: Upload iOS integration tests artifact
614-
uses: actions/upload-artifact@v2.2.2
614+
uses: actions/upload-artifact@v3
615615
if: ${{ !cancelled() }}
616616
with:
617617
name: testapps-ios-macos-latest
618618
path: testapps-ios-macos-latest
619619
retention-days: ${{ env.artifactRetentionDays }}
620620
- name: Upload iOS build results artifact
621-
uses: actions/upload-artifact@v2.2.2
621+
uses: actions/upload-artifact@v3
622622
if: ${{ !cancelled() }}
623623
with:
624624
name: log-artifact
625625
path: build-results-ios-macos-latest*
626626
retention-days: ${{ env.artifactRetentionDays }}
627627
- name: Download log artifacts
628628
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
629-
uses: actions/download-artifact@v2.0.8
629+
uses: actions/download-artifact@v3
630630
with:
631631
path: test_results
632632
name: log-artifact
@@ -721,22 +721,22 @@ jobs:
721721
echo "__SUMMARY_MISSING__" > build-results-tvos-macos-latest.log.json
722722
fi
723723
- name: Upload tvOS integration tests artifact
724-
uses: actions/upload-artifact@v2.2.2
724+
uses: actions/upload-artifact@v3
725725
if: ${{ !cancelled() }}
726726
with:
727727
name: testapps-tvos-macos-latest
728728
path: testapps-tvos-macos-latest
729729
retention-days: ${{ env.artifactRetentionDays }}
730730
- name: Upload tvOS build results artifact
731-
uses: actions/upload-artifact@v2.2.2
731+
uses: actions/upload-artifact@v3
732732
if: ${{ !cancelled() }}
733733
with:
734734
name: log-artifact
735735
path: build-results-tvos-macos-latest*
736736
retention-days: ${{ env.artifactRetentionDays }}
737737
- name: Download log artifacts
738738
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
739-
uses: actions/download-artifact@v2.0.8
739+
uses: actions/download-artifact@v3
740740
with:
741741
path: test_results
742742
name: log-artifact
@@ -776,7 +776,7 @@ jobs:
776776
with:
777777
ref: ${{needs.check_and_prepare.outputs.github_ref}}
778778
- name: Download Desktop integration tests artifact
779-
uses: actions/download-artifact@v2.0.8
779+
uses: actions/download-artifact@v3
780780
with:
781781
path: testapps
782782
name: testapps-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}
@@ -814,19 +814,20 @@ jobs:
814814
if: ${{ !cancelled() }}
815815
shell: bash
816816
run: |
817-
if [ ! -f testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}.log.json ]; then
817+
# If testapps do not exist, then it's a build error not test error.
818+
if [ -d "testapps/testapps-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}" && ! -f testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}.log.json ]; then
818819
mkdir -p testapps && echo "__SUMMARY_MISSING__" > testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}.log.json
819820
fi
820821
- name: Upload Desktop test results artifact
821822
if: ${{ !cancelled() }}
822-
uses: actions/upload-artifact@v2.2.2
823+
uses: actions/upload-artifact@v3
823824
with:
824825
name: log-artifact
825826
path: testapps/test-results-desktop-${{ matrix.os }}-${{ matrix.ssl_variant }}*
826827
retention-days: ${{ env.artifactRetentionDays }}
827828
- name: Download log artifacts
828829
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
829-
uses: actions/download-artifact@v2.0.8
830+
uses: actions/download-artifact@v3
830831
with:
831832
path: test_results
832833
name: log-artifact
@@ -866,7 +867,7 @@ jobs:
866867
with:
867868
ref: ${{needs.check_and_prepare.outputs.github_ref}}
868869
- name: Download Android integration tests artifact
869-
uses: actions/download-artifact@v2.0.8
870+
uses: actions/download-artifact@v3
870871
with:
871872
path: testapps
872873
name: testapps-android-${{ matrix.build_os }}
@@ -918,19 +919,20 @@ jobs:
918919
if: ${{ !cancelled() }}
919920
shell: bash
920921
run: |
921-
if [ ! -f "testapps/test-results-android-${{ matrix.build_os }}-${{ matrix.android_device }}.log.json" ]; then
922+
# If testapps do not exist, then it's a build error not test error.
923+
if [ -d "testapps/testapps-android-${{ matrix.build_os }}" && ! -f "testapps/test-results-android-${{ matrix.build_os }}-${{ matrix.android_device }}.log.json" ]; then
922924
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-android-${{ matrix.build_os }}-${{ matrix.android_device }}.log.json"
923925
fi
924926
- name: Upload Android test results artifact
925927
if: ${{ !cancelled() }}
926-
uses: actions/upload-artifact@v2.2.2
928+
uses: actions/upload-artifact@v3
927929
with:
928930
name: log-artifact
929931
path: testapps/test-results-android-${{ matrix.build_os }}-${{ matrix.android_device }}*
930932
retention-days: ${{ env.artifactRetentionDays }}
931933
- name: Download log artifacts
932934
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
933-
uses: actions/download-artifact@v2.0.8
935+
uses: actions/download-artifact@v3
934936
with:
935937
path: test_results
936938
name: log-artifact
@@ -969,7 +971,7 @@ jobs:
969971
with:
970972
ref: ${{needs.check_and_prepare.outputs.github_ref}}
971973
- name: Download iOS integration tests artifact
972-
uses: actions/download-artifact@v2.0.8
974+
uses: actions/download-artifact@v3
973975
with:
974976
path: testapps
975977
name: testapps-ios-macos-latest
@@ -1021,19 +1023,20 @@ jobs:
10211023
if: ${{ !cancelled() }}
10221024
shell: bash
10231025
run: |
1024-
if [ ! -f "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json" ]; then
1026+
# If testapps do not exist, then it's a build error not test error.
1027+
if [ -d "testapps/testapps-ios-macos-latest" && ! -f "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json" ]; then
10251028
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}.log.json"
10261029
fi
10271030
- name: Upload iOS test results artifact
10281031
if: ${{ !cancelled() }}
1029-
uses: actions/upload-artifact@v2.2.2
1032+
uses: actions/upload-artifact@v3
10301033
with:
10311034
name: log-artifact
10321035
path: testapps/test-results-ios-macos-latest-${{ matrix.ios_device }}*
10331036
retention-days: ${{ env.artifactRetentionDays }}
10341037
- name: Download log artifacts
10351038
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
1036-
uses: actions/download-artifact@v2.0.8
1039+
uses: actions/download-artifact@v3
10371040
with:
10381041
path: test_results
10391042
name: log-artifact
@@ -1072,7 +1075,7 @@ jobs:
10721075
with:
10731076
ref: ${{needs.check_and_prepare.outputs.github_ref}}
10741077
- name: Download tvOS integration tests artifact
1075-
uses: actions/download-artifact@v2.0.8
1078+
uses: actions/download-artifact@v3
10761079
with:
10771080
path: testapps
10781081
name: testapps-tvos-macos-latest
@@ -1102,19 +1105,20 @@ jobs:
11021105
if: ${{ !cancelled() }}
11031106
shell: bash
11041107
run: |
1105-
if [ ! -f "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json" ]; then
1108+
# If testapps do not exist, then it's a build error not test error.
1109+
if [ -d "testapps/testapps-tvos-macos-latest" && ! -f "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json" ]; then
11061110
mkdir -p testapps && echo "__SUMMARY_MISSING__" > "testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}.log.json"
11071111
fi
11081112
- name: Upload tvOS test results artifact
11091113
if: ${{ !cancelled() }}
1110-
uses: actions/upload-artifact@v2.2.2
1114+
uses: actions/upload-artifact@v3
11111115
with:
11121116
name: log-artifact
11131117
path: testapps/test-results-tvos-macos-latest-${{ matrix.tvos_device }}*
11141118
retention-days: ${{ env.artifactRetentionDays }}
11151119
- name: Download log artifacts
11161120
if: ${{ needs.check_and_prepare.outputs.pr_number && failure() && !cancelled() }}
1117-
uses: actions/download-artifact@v2.0.8
1121+
uses: actions/download-artifact@v3
11181122
with:
11191123
path: test_results
11201124
name: log-artifact
@@ -1152,7 +1156,7 @@ jobs:
11521156
- name: Install python deps
11531157
run: pip install -r scripts/gha/requirements.txt
11541158
- name: Download log artifacts
1155-
uses: actions/download-artifact@v2.0.8
1159+
uses: actions/download-artifact@v3
11561160
with:
11571161
path: test_results
11581162
name: log-artifact

0 commit comments

Comments
 (0)