Skip to content

Commit

Permalink
GitHub CI for 3.0.x (#4358)
Browse files Browse the repository at this point in the history
* Refs #19452: Change github workflow for discovery-server

Signed-off-by: elianalf <[email protected]>

* Refs #19452: Change github workflow for documentation

Signed-off-by: elianalf <[email protected]>

---------

Signed-off-by: elianalf <[email protected]>
  • Loading branch information
elianalf authored and JLBuenoLopez committed Mar 11, 2024
1 parent a97e7ab commit bb6e749
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/address-sanitizers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ on:
discovery_server_branch:
description: 'Branch or tag of Discovery Server repository (https://github.com/eProsima/Discovery-Server)'
required: true
default: 'master'
default: '3.0.x-devel'
fastdds_branch:
description: 'Branch or tag of Fast DDS repository (https://github.com/eProsima/Fast-DDS)'
required: true
default: 'master'
default: '3.0.x-devel'

pull_request:
branches:
- 'master'
- '3.0.x-devel'
paths-ignore:
- '**.md'
- '**.txt'
Expand Down Expand Up @@ -122,8 +122,8 @@ jobs:
runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || 'master' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'master' }}
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '3.0.x-devel' }}
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || '3.0.x-devel' }}

steps:
- name: Install apt packages
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ on:
description: 'Documentation branch name'
required: true
type: string
default: 'master'
default: '3.0.x-devel'

pull_request:
branches:
- 'master'
paths-ignore:
- '**.md'
- '**.txt'
Expand Down Expand Up @@ -108,7 +106,7 @@ jobs:
# Attempt to use version's branch, which will most likely be the base anyways.
# This is just in case the PR was to an intermediate branch
TEMP_BRANCH=master
TEMP_BRANCH=3.0.x-devel
RESPONSE_CODE=$(git ls-remote --heads $DOCS_REPO $TEMP_BRANCH | wc -l)
if [[ ${RESPONSE_CODE} == "0" ]]
Expand Down

0 comments on commit bb6e749

Please sign in to comment.