From 972c20a4ac4083dec91925ef171353bb96ce6d2a Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Lizano Date: Fri, 10 May 2024 12:40:33 +0200 Subject: [PATCH] Use same branch reusable workflow (#106) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use same branch reusable workflow Signed-off-by: Raul Sanchez-Mateos * Change custom version intput in project dependencies action Signed-off-by: Raul Sanchez-Mateos * Test inputsç Signed-off-by: Raul Sanchez-Mateos * Remove debug jobs Signed-off-by: Raul Sanchez-Mateos --------- Signed-off-by: Raul Sanchez-Mateos --- .../actions/project_dependencies/action.yml | 5 --- .github/workflows/nightly.yml | 4 +-- .github/workflows/reusable-workflow.yml | 34 ++++++++++--------- .github/workflows/test.yml | 2 +- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.github/actions/project_dependencies/action.yml b/.github/actions/project_dependencies/action.yml index 6b93560..1decd68 100644 --- a/.github/actions/project_dependencies/action.yml +++ b/.github/actions/project_dependencies/action.yml @@ -12,12 +12,7 @@ inputs: Use the custom version build from eProsima-CI. If set to false, the workflow will run the tests for Fast DDS v2 and v3. required: true - type: choice default: 'custom' - options: - - custom - - v2 - - v3 cmake_build_type: description: Specify cmake_build_type option to download specific artifact diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 39af5c0..f32a98a 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -9,7 +9,7 @@ jobs: reusable_tests_v2: name: reusable_tests_v2 - uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml + uses: ./.github/workflows/reusable-workflow.yml with: custom_version_build: 'v2' dependencies_artifact_postfix: '_nightly' @@ -17,7 +17,7 @@ jobs: # Uncomment this block to run the tests for Fast DDS v3 when dev-utils is updated # reusable_tests_v3: # name: reusable_tests_v3 - # uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml + # uses: ./.github/workflows/reusable-workflow.yml # with: # custom_version_build: 'v3' # dependencies_artifact_postfix: '_nightly' diff --git a/.github/workflows/reusable-workflow.yml b/.github/workflows/reusable-workflow.yml index 2feb6d2..969407b 100644 --- a/.github/workflows/reusable-workflow.yml +++ b/.github/workflows/reusable-workflow.yml @@ -43,16 +43,18 @@ on: custom_version_build: description: > - Use the custom version build from eProsima-CI. - If set to false, the workflow will run the tests for Fast DDS v2 and v3. + Version of Fast DDS build from eProsima-CI. required: true type: string + default: 'v2' dependencies_artifact_postfix: - description: 'Postfix name to add to artifact name to download dependencies. This is use to download a specific artifact version from eProsima-CI.' + description: > + Postfix name to add to artifact name to download dependencies. + This is use to download a specific artifact version from eProsima-CI. required: true - default: '_nightly' type: string + default: '_nightly' env: code_packages_names: 'cmake_utils cpp_utils py_utils' @@ -91,8 +93,8 @@ jobs: with: os: ${{ matrix.os }} cmake_build_type: ${{ matrix.cmake_build_type }} - custom_version_build: ${{ github.event.inputs.custom_version_build }} - dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix }} + custom_version_build: ${{ inputs.custom_version_build }} + dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }} secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests @@ -122,8 +124,8 @@ jobs: with: os: ubuntu-22.04 cmake_build_type: Release - custom_version_build: ${{ github.event.inputs.custom_version_build }} - dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix }} + custom_version_build: ${{ inputs.custom_version_build }} + dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }} secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests @@ -153,8 +155,8 @@ jobs: with: os: ubuntu-22.04 cmake_build_type: Release - custom_version_build: ${{ github.event.inputs.custom_version_build }} - dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix }} + custom_version_build: ${{ inputs.custom_version_build }} + dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }} secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests @@ -181,8 +183,8 @@ jobs: with: os: ubuntu-22.04 cmake_build_type: Release - custom_version_build: ${{ github.event.inputs.custom_version_build }} - dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix }} + custom_version_build: ${{ inputs.custom_version_build }} + dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }} secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests @@ -211,8 +213,8 @@ jobs: with: os: ubuntu-22.04 cmake_build_type: Release - custom_version_build: ${{ github.event.inputs.custom_version_build }} - dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix }} + custom_version_build: ${{ inputs.custom_version_build }} + dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }} secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests @@ -241,8 +243,8 @@ jobs: with: os: ubuntu-22.04 cmake_build_type: Release - custom_version_build: ${{ github.event.inputs.custom_version_build }} - dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix }} + custom_version_build: ${{ inputs.custom_version_build }} + dependencies_artifact_postfix: ${{ inputs.dependencies_artifact_postfix }} secret_token: ${{ secrets.GITHUB_TOKEN }} - name: Compile and run tests diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a8439a3..05d99dd 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,7 +30,7 @@ jobs: reusable_tests: name: reusable_tests - uses: eProsima/dev-utils/.github/workflows/reusable-workflow.yml + uses: ./.github/workflows/reusable-workflow.yml with: custom_version_build: ${{ github.event.inputs.custom_version_build || 'v2' }} dependencies_artifact_postfix: ${{ github.event.inputs.dependencies_artifact_postfix || '_nightly' }}