Refs #21158: Adjust conditions

Signed-off-by: JesusPoderoso <[email protected]>
eProsima · Jun 20, 2024 · 09b6cd9 · 09b6cd9
1 parent 54042b1
commit 09b6cd9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/mac-ci.yml b/.github/workflows/mac-ci.yml
@@ -55,6 +55,6 @@ jobs:
       cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args }}
       fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
-      run-build: ${{ (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) || true }}
-      run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }}
+      run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
+      run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
       use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }}
diff --git a/.github/workflows/sanitizers-ci.yml b/.github/workflows/sanitizers-ci.yml
@@ -61,12 +61,15 @@ jobs:
     uses: ./.github/workflows/reusable-sanitizers-ci.yml
     with:
       label: ${{ inputs.label || 'fastdds-sanitizers-ci' }}
-      run_asan_fastdds: ${{ ((inputs.run_asan_fastdds == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'no-test') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
-      run_asan_discovery_server: ${{ ((inputs.run_asan_discovery_server == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'no-test') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
-      run_tsan_fastdds: ${{ ((inputs.run_tsan_fastdds == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'no-test') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
+      run_asan_fastdds: ${{ ((inputs.run_asan_fastdds == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'no-test') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
+      run_asan_discovery_server: ${{ ((inputs.run_asan_discovery_server == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'no-test') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
+      run_tsan_fastdds: ${{ ((inputs.run_tsan_fastdds == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'no-test') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
       colcon_build_args: ${{ inputs.colcon_build_args || '' }}
       colcon_test_args: ${{ inputs.colcon_test_args || '' }}
       cmake_args: ${{ inputs.cmake_args || '' }}
       ctest_args: ${{ inputs.ctest_args || '' }}
       fastdds_ref: ${{ inputs.fastdds_ref || github.ref || 'master' }}
       discovery_server_ref: ${{ inputs.discovery_server_ref || 'master' }}
+
+
+      run-build: ${{ !github.event_name == 'pull_request' && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -64,6 +64,6 @@ jobs:
       ctest-args: ${{ inputs.ctest-args || '-LE xfail' }}
       fastdds-branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
       security: ${{ ((inputs.security == true) && true) || github.event_name == 'pull_request' }}
-      run-build: ${{ (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) || true }}
-      run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }}
+      run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
+      run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}
       use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }}
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -50,5 +50,5 @@ jobs:
       cmake-args: '-DSECURITY=ON ${{ inputs.cmake-args }}'
       ctest-args: ${{ inputs.ctest-args }}
       fastdds_branch: ${{ inputs.fastdds_branch || github.ref || 'master' }}
-      run-build: ${{ (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) || true }}
-      run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }}
+      run-build: ${{ !(github.event_name == 'pull_request') && true || (!contains(github.event.pull_request.labels.*.name, 'skip-ci') && !contains(github.event.pull_request.labels.*.name, 'conflicts')) && true || false }}
+      run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) && true || false }}