Skip to content

Commit 309101f

Browse files
chore: adjust workflow trigger on develop (#317)
Adjusting workflow trigger on `develop` branch to revert unnecessary change in #309
1 parent 8652407 commit 309101f

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

.github/workflows/reusable-build-test-release.yml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ on:
1919
description: 'Version of release in the form of "x.x.x" string, specified by user instead of automatically generated semantic release'
2020
type: string
2121
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'
2722
execute-tests-on-push-to-release:
2823
required: false
2924
description: 'Flag to run all tests on push to release branch'
@@ -173,10 +168,8 @@ jobs:
173168
fi
174169
;;
175170
"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
180173
for test_type in "${TESTSET[@]}"; do
181174
EXECUTE_LABELED["$test_type"]="true"
182175
done
@@ -1858,10 +1851,7 @@ jobs:
18581851
${{ needs.setup.outputs.directory-path }}/diag*
18591852
18601853
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' }}
18651855
needs:
18661856
- build
18671857
- test-inventory

0 commit comments

Comments
 (0)