|
19 | 19 | description: 'Version of release in the form of "x.x.x" string, specified by user instead of automatically generated semantic release'
|
20 | 20 | type: string
|
21 | 21 | default: ""
|
22 |
| - execute-tests-on-push-to-develop: |
23 |
| - required: false |
24 |
| - description: 'Flag to run all tests on push to develop branch' |
25 |
| - type: string |
26 |
| - default: 'false' |
27 | 22 | execute-tests-on-push-to-release:
|
28 | 23 | required: false
|
29 | 24 | description: 'Flag to run all tests on push to release branch'
|
@@ -173,10 +168,8 @@ jobs:
|
173 | 168 | fi
|
174 | 169 | ;;
|
175 | 170 | "push")
|
176 |
| - if ${{ github.ref_name == 'main' }} || |
177 |
| - ${{ github.ref_name == 'develop' && inputs.execute-tests-on-push-to-develop == 'true' }} || |
178 |
| - ${{ startsWith(github.ref_name, 'release/') && inputs.execute-tests-on-push-to-release == 'true' }} || |
179 |
| - ${{ github.ref_type == 'tag' }} ; then |
| 171 | + if ${{ github.ref_name == 'main' }} || ${{ github.ref_name == 'develop' }} || ${{ github.ref_type == 'tag' }} || |
| 172 | + ${{ startsWith(github.ref_name, 'release/') && inputs.execute-tests-on-push-to-release == 'true' }} ; then |
180 | 173 | for test_type in "${TESTSET[@]}"; do
|
181 | 174 | EXECUTE_LABELED["$test_type"]="true"
|
182 | 175 | done
|
@@ -1858,10 +1851,7 @@ jobs:
|
1858 | 1851 | ${{ needs.setup.outputs.directory-path }}/diag*
|
1859 | 1852 |
|
1860 | 1853 | run-scripted-input-tests-full-matrix:
|
1861 |
| - if: | |
1862 |
| - ( !cancelled() && needs.build.result == 'success' && needs.test-inventory.outputs.scripted_inputs == 'true' ) && |
1863 |
| - ( github.base_ref == 'main' || github.ref_name == 'main' || ( github.ref_name == 'develop' && inputs.execute-tests-on-push-to-develop == 'true' ) || ( startsWith(github.ref_name, 'release/') && inputs.execute-tests-on-push-to-release == 'true' ) ) && |
1864 |
| - ( needs.setup-workflow.outputs.execute-scripted_inputs-labeled == 'true' ) |
| 1854 | + if: ${{ !cancelled() && needs.build.result == 'success' && needs.test-inventory.outputs.scripted_inputs == 'true' && ( github.base_ref == 'main' || github.ref_name == 'main' ) && needs.setup-workflow.outputs.execute-scripted_inputs-labeled == 'true' }} |
1865 | 1855 | needs:
|
1866 | 1856 | - build
|
1867 | 1857 | - test-inventory
|
|
0 commit comments