Skip to content

Commit

Permalink
Refs #19452: Fix base branch decision making
Browse files Browse the repository at this point in the history
Signed-off-by: EduPonz <[email protected]>
  • Loading branch information
EduPonz committed Mar 15, 2024
1 parent 5159d4a commit b5b2f13
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ concurrency:

jobs:
ubuntu-ci:
if: ${{ (github.event_name == 'pull_request') && (github.head_ref != '4.0.x-devel') }}
if: ${{ (github.event_name == 'pull_request') && (github.base_ref != '4.0.x-devel') }}
strategy:
fail-fast: false
matrix:
Expand All @@ -57,7 +57,7 @@ jobs:
fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || 'master' }}

ubuntu-ci-4_0_x-devel:
if: ${{ (github.event_name == 'pull_request') && (github.head_ref == '4.0.x-devel') }}
if: ${{ (github.event_name == 'pull_request') && (github.base_ref == '4.0.x-devel') }}
strategy:
fail-fast: false
matrix:
Expand All @@ -76,4 +76,4 @@ jobs:
fastcdr_branch: ${{ matrix.fastcdr_version }}
fastdds_branch: ${{ inputs.fastdds_branch || github.ref || '3.0.x-devel' }}
fastdds_python_branch: ${{ inputs.fastdds_python_branch || github.ref || '3.0.x-devel' }}
fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || '4.0.x-devel' }}
fastddsgen_branch: ${{ inputs.fastddsgen_branch || github.ref || '4.0.x-devel' }}

0 comments on commit b5b2f13

Please sign in to comment.