diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3ed4ee28..ac7fc1bb 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -13,14 +13,14 @@ jobs: with: custom_version_build: 'v2' dependencies_artifact_postfix: '_nightly' + ref: '2.x' secrets: inherit - # Uncomment this block to run the tests for Fast DDS v3 when DDS Record & Replay is updated - # Also specify here (and above) the workflow version/branch to use (@v0, @main, etc.) - # reusable_tests_v3: - # name: reusable_tests_v3 - # uses: ./.github/workflows/reusable-workflow.yml - # with: - # custom_version_build: 'v3' - # dependencies_artifact_postfix: '_nightly' - # secrets: inherit + reusable_tests_v3: + name: reusable_tests_v3 + uses: ./.github/workflows/reusable-workflow.yml + with: + custom_version_build: 'v3' + dependencies_artifact_postfix: '_nightly' + ref: 'main' + secrets: inherit diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index 4c5cbb9b..2e3d731e 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -59,6 +59,13 @@ on: default: '_nightly' type: string + ref: + description: > + The branch or tag name to checkout. + required: true + type: string + default: 'main' + env: # TODO: controller is not tested as it has no tests code_packages_names: 'ddsrecorder_participants ddsrecorder_yaml ddsrecorder_tool ddsreplayer_tool' @@ -89,6 +96,7 @@ jobs: uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src + ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies @@ -120,6 +128,7 @@ jobs: uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src + ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies @@ -148,6 +157,7 @@ jobs: uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src + ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies @@ -176,6 +186,7 @@ jobs: uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src + ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies @@ -206,6 +217,7 @@ jobs: uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src + ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies @@ -236,6 +248,7 @@ jobs: uses: eProsima/eProsima-CI/external/checkout@v0 with: path: src + ref: ${{ inputs.ref }} - name: Download dependencies and install requirements uses: ./src/.github/actions/project_dependencies diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c1fecfe..97fc36e5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -33,6 +33,7 @@ jobs: name: reusable_tests uses: ./.github/workflows/reusable-workflow.yml with: - custom_version_build: ${{ inputs.custom_version_build || 'v2' }} + custom_version_build: ${{ inputs.custom_version_build || 'v3' }} dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix || '_nightly' }} + ref: ${{ github.ref }} secrets: inherit