Skip to content

Commit 4d547fe

Browse files
Use Fast-DDS master branch and artifacts (#14)
Signed-off-by: Juan Lopez Fernandez <juanlopez@eprosima.com>
1 parent 0bc51fe commit 4d547fe

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/docker/ddsenabler/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
In order to build this docker image, use command in current directory:
44

55
```sh
6-
docker build --rm -t ddsenabler_test:some_tag --build-arg "fastcdr_branch=master" --build-arg "fastdds_branch=feature/json-deserialize" --build-arg "devutils_branch=main" --build-arg "ddspipe_branch=tmp/dds_enabler" --build-arg "ddsenabler_branch=CI" .
6+
docker build --rm -t ddsenabler_test:some_tag --build-arg "fastcdr_branch=master" --build-arg "fastdds_branch=master" --build-arg "devutils_branch=main" --build-arg "ddspipe_branch=tmp/dds_enabler" --build-arg "ddsenabler_branch=CI" .
77
```

.github/workflows/nightly-system-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
uses: ./.github/workflows/docker-reusable-workflow.yml
1414
with:
1515
fastcdr_branch: 'master'
16-
fastdds_branch: 'feature/json-deserialize'
16+
fastdds_branch: 'master'
1717
devutils_branch: 'main'
1818
ddspipe_branch: 'main'
1919
ddsenabler_branch: 'main'

.github/workflows/test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ on:
3838
dependencies_artifact_postfix:
3939
description: 'Postfix name to add to artifact name to download dependencies. This is use to download a specific artifact version from eProsima-CI.'
4040
required: true
41-
default: '_ddsenabler'
41+
default: '_nightly'
4242

4343
pull_request:
4444
push:
@@ -51,15 +51,15 @@ jobs:
5151
name: reusable_tests
5252
uses: ./.github/workflows/reusable-ubuntu-ci.yml
5353
with:
54-
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_ddsenabler' }}
54+
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}
5555
ref: ${{ github.ref }}
5656
secrets: inherit
5757

5858
reusable_tests_windows:
5959
name: reusable_tests
6060
uses: ./.github/workflows/reusable-windows-ci.yml
6161
with:
62-
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_ddsenabler' }}
62+
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}
6363
ref: ${{ github.ref }}
6464
secrets: inherit
6565

@@ -68,10 +68,10 @@ jobs:
6868
uses: ./.github/workflows/docker-reusable-workflow.yml
6969
with:
7070
fastcdr_branch: ${{ inputs.fastcdr_branch || 'master' }}
71-
fastdds_branch: ${{ inputs.fastdds_branch || 'feature/json-deserialize' }}
71+
fastdds_branch: ${{ inputs.fastdds_branch || 'master' }}
7272
devutils_branch: ${{ inputs.devutils_branch || 'main' }}
7373
ddspipe_branch: ${{ inputs.ddspipe_branch || 'main' }}
7474
ddsenabler_branch: ${{ inputs.ddsenabler_branch || github.head_ref || github.ref_name }}
75-
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_ddsenabler' }}
75+
dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }}
7676
ref: ${{ github.ref }}
7777
secrets: inherit

ddsenabler.repos

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ repositories:
1010
fastdds:
1111
type: git
1212
url: https://github.com/eProsima/Fast-DDS.git
13-
version: feature/json-deserialize
13+
version: master
1414
dev-utils:
1515
type: git
1616
url: https://github.com/eProsima/dev-utils.git

0 commit comments

Comments
 (0)