From ccddbf5f034b1e055c07dfa8a1056a25f48bc733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Poderoso?= <120394830+JesusPoderoso@users.noreply.github.com> Date: Wed, 2 Oct 2024 13:00:24 +0200 Subject: [PATCH] Allow runing CI on external contributions (#5220) * Refs #21479: Include labeling check Signed-off-by: JesusPoderoso * Refs #21479: Keep 'Add label' job only in ubuntu workflow Signed-off-by: JesusPoderoso * Refs #21479: Apply rev suggestions Signed-off-by: eProsima --------- Signed-off-by: JesusPoderoso Signed-off-by: eProsima (cherry picked from commit 2d1e793d3afc541fe99d8449e0cdf822f6c5901f) --- .github/workflows/reusable-mac-ci.yml | 8 -------- .github/workflows/reusable-sanitizers-ci.yml | 16 ---------------- .github/workflows/reusable-ubuntu-ci.yml | 7 ++++++- .github/workflows/reusable-windows-ci.yml | 8 -------- .github/workflows/ubuntu-ci.yml | 1 + 5 files changed, 7 insertions(+), 33 deletions(-) diff --git a/.github/workflows/reusable-mac-ci.yml b/.github/workflows/reusable-mac-ci.yml index 1dfebbd36fb..f4d783210ae 100644 --- a/.github/workflows/reusable-mac-ci.yml +++ b/.github/workflows/reusable-mac-ci.yml @@ -48,14 +48,6 @@ jobs: cmake-build-type: - 'RelWithDebInfo' steps: - - name: Add ci-pending label if PR - if: ${{ github.event_name == 'pull_request' }} - uses: eProsima/eProsima-CI/external/add_labels@v0 - with: - labels: ci-pending - number: ${{ github.event.number }} - repo: eProsima/Fast-DDS - - name: Sync eProsima/Fast-DDS repository uses: eProsima/eProsima-CI/external/checkout@v0 with: diff --git a/.github/workflows/reusable-sanitizers-ci.yml b/.github/workflows/reusable-sanitizers-ci.yml index 226795f7354..a0df722a7fc 100644 --- a/.github/workflows/reusable-sanitizers-ci.yml +++ b/.github/workflows/reusable-sanitizers-ci.yml @@ -55,14 +55,6 @@ jobs: if: ${{ inputs.run_asan_fastdds == true }} runs-on: ubuntu-22.04 steps: - - name: Add ci-pending label if PR - if: ${{ github.event_name == 'pull_request' }} - uses: eProsima/eProsima-CI/external/add_labels@v0 - with: - labels: ci-pending - number: ${{ github.event.number }} - repo: eProsima/Fast-DDS - - name: Sync eProsima/Fast-DDS repository uses: eProsima/eProsima-CI/external/checkout@v0 with: @@ -342,14 +334,6 @@ jobs: CC: gcc-12 CXX: g++-12 steps: - - name: Add ci-pending label if PR - if: ${{ github.event_name == 'pull_request' }} - uses: eProsima/eProsima-CI/external/add_labels@v0 - with: - labels: ci-pending - number: ${{ github.event.number }} - repo: eProsima/Fast-DDS - - name: Sync eProsima/Fast-DDS repository uses: eProsima/eProsima-CI/external/checkout@v0 with: diff --git a/.github/workflows/reusable-ubuntu-ci.yml b/.github/workflows/reusable-ubuntu-ci.yml index ea50fd3753d..a2042bcc4fd 100644 --- a/.github/workflows/reusable-ubuntu-ci.yml +++ b/.github/workflows/reusable-ubuntu-ci.yml @@ -52,6 +52,11 @@ on: required: false type: boolean default: false + add-label: + description: 'Add the CI-PENDING label to the PR' + required: false + type: boolean + default: false env: security-cmake-flag: ${{ inputs.security == true && '-DSECURITY=ON' || '-DSECURITY=OFF' }} @@ -71,7 +76,7 @@ jobs: - 'RelWithDebInfo' steps: - name: Add ci-pending label if PR - if: ${{ github.event_name == 'pull_request' }} + if: ${{ github.event_name == 'pull_request' && inputs.add-label == true }} uses: eProsima/eProsima-CI/external/add_labels@v0 with: labels: ci-pending diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index f7f9bfe0fe3..934049673f0 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -39,14 +39,6 @@ jobs: vs-toolset: - 'v142' steps: - - name: Add ci-pending label if PR - if: ${{ github.event_name == 'pull_request' }} - uses: eProsima/eProsima-CI/external/add_labels@v0 - with: - labels: ci-pending - number: ${{ github.event.number }} - repo: eProsima/Fast-DDS - - name: Sync eProsima/Fast-DDS repository uses: eProsima/eProsima-CI/external/checkout@v0 with: diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 4c18d5eaa3b..84944b89336 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -69,3 +69,4 @@ jobs: run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }} run-tests: ${{ ((inputs.run-tests == true) && true) || (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'no-test')) }} use-ccache: ${{ ((inputs.use-ccache == true) && true) || false }} + add-label: ${{ (github.event_name == 'pull_request') && (github.event.pull_request.head.repo.full_name == github.repository) && true || false }}