Skip to content

Commit

Permalink
Only run PRs CI when review is requested (#4599) (#4615)
Browse files Browse the repository at this point in the history
* Only run PRs CI when run-ci label is added (#4599)

* Refs #20648: Only run PRs CI when run-ci label is added

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

* Refs #20648: Correctly add ci-pending label

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

* Refs #20648: Fix documentation trigger

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

* Refs #20648: Add ci-pending label in mac CI

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

* Refs #20648: Set eProsima-CI version to v0 on add and remove labels actions

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

* Refs #20648: Change Github workflows trigger to 'review_requested'

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

---------

Signed-off-by: EduPonz <[email protected]>
(cherry picked from commit d0a334b)

# Conflicts:
#	.github/workflows/address-sanitizers.yaml
#	.github/workflows/documentation-tests.yaml
#	.github/workflows/mac-ci.yml
#	.github/workflows/thread-sanitizer.yaml
#	.github/workflows/ubuntu-ci.yml
#	.github/workflows/windows-ci.yml

* Fix conflicts

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

---------

Signed-off-by: JesusPoderoso <[email protected]>
Co-authored-by: Eduardo Ponz Segrelles <[email protected]>
Co-authored-by: JesusPoderoso <[email protected]>
  • Loading branch information
3 people authored Apr 1, 2024
1 parent 74315c2 commit 39b3d58
Show file tree
Hide file tree
Showing 9 changed files with 106 additions and 26 deletions.
36 changes: 28 additions & 8 deletions .github/workflows/address-sanitizers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ on:
default: '2.6.x'

pull_request:
branches:
- '2.6.x'
types:
- review_requested
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -27,16 +27,26 @@ concurrency:
jobs:
asan-test:

if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'no-test') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}

runs-on: ubuntu-22.04

env:
FASTDDS_BRANCH: ${{ github.head_ref || github.event.inputs.fastdds_branch || '2.6.x' }}

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

# https://github.com/actions/runner-images/issues/9491
- name: Fix kernel mmap rnd bits
run: sudo sysctl vm.mmap_rnd_bits=28
Expand Down Expand Up @@ -123,9 +133,11 @@ jobs:
asan-discovery-server-test:

if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'no-test') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}

runs-on: ubuntu-22.04

Expand All @@ -134,6 +146,14 @@ jobs:
DEFAULT_DISCOVERY_SERVER_BRANCH: ${{ github.event.inputs.discovery_server_branch || 'v1.2.1' }}

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

# https://github.com/actions/runner-images/issues/9491
- name: Fix kernel mmap rnd bits
run: sudo sysctl vm.mmap_rnd_bits=28
Expand Down
18 changes: 14 additions & 4 deletions .github/workflows/documentation-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
default: '2.6.x'

pull_request:
branches:
- '2.6.x'
types:
- review_requested
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -26,11 +26,21 @@ env:
jobs:
ubuntu-build-and-test-documentation:
name: Documentation build and test
if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}

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:
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ on:
required: true

pull_request:
branches:
- '2.6.x'
types:
- review_requested
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -38,9 +38,11 @@ concurrency:

jobs:
mac-ci:
if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}
uses: ./.github/workflows/reusable-mac-ci.yml
if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
with:
label: ${{ inputs.label || 'mac-ci' }}
colcon-args: ${{ inputs.colcon-args }}
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/reusable-mac-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@ 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:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/reusable-ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@ 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:
Expand Down
8 changes: 8 additions & 0 deletions .github/workflows/reusable-windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ jobs:
- 'v141'
- '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:
Expand Down
20 changes: 15 additions & 5 deletions .github/workflows/thread-sanitizer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ on:
type: string

pull_request:
branches:
- '2.6.x'
types:
- review_requested
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -32,9 +32,11 @@ jobs:
ubuntu-sanitizer-run:
name: Sanitizer Evaluation

if: ${{ !(contains(github.event.pull_request.labels.*.name, 'no-test') ||
contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'no-test') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}

runs-on: ubuntu-22.04

Expand All @@ -47,6 +49,14 @@ jobs:
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

# https://github.com/actions/runner-images/issues/9491
- name: Fix kernel mmap rnd bits
run: sudo sysctl vm.mmap_rnd_bits=28
Expand Down
14 changes: 13 additions & 1 deletion .github/workflows/ubuntu-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,16 @@ on:
type: string
required: true

pull_request:
types:
- review_requested
paths-ignore:
- '**.md'
- '**.txt'
- '!**/CMakeLists.txt'

concurrency:
group: ${{ github.workflow }}
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
Expand All @@ -37,6 +45,10 @@ jobs:
os-image:
- 'ubuntu-20.04'

if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}
uses: ./.github/workflows/reusable-ubuntu-ci.yml
with:
os-image: ${{ matrix.os-image }}
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ on:
required: true

pull_request:
branches:
- '2.6.x'
types:
- review_requested
paths-ignore:
- '**.md'
- '**.txt'
Expand All @@ -38,9 +38,11 @@ concurrency:

jobs:
windows-ci:
if: ${{ (
!contains(github.event.pull_request.labels.*.name, 'skip-ci') &&
!contains(github.event.pull_request.labels.*.name, 'conflicts')
) }}
uses: ./.github/workflows/reusable-windows-ci.yml
if: ${{ !(contains(github.event.pull_request.labels.*.name, 'skip-ci') ||
contains(github.event.pull_request.labels.*.name, 'conflicts')) }}
with:
label: ${{ inputs.label || 'windows-ci' }}
colcon-args: ${{ inputs.colcon-args }}
Expand Down

0 comments on commit 39b3d58

Please sign in to comment.