Skip to content

Commit dd51de8

Browse files
mergify[bot]MiguelCompany
mergify[bot]
and
MiguelCompany
authored
Make skip-ci label report required statuses as pass (#254) (#255)
* Refs #25442. Update Ubuntu workflows * Refs #25442. Update Windows workflows --------- (cherry picked from commit f0a8431) Signed-off-by: Miguel Company <miguelcompany@eprosima.com> Co-authored-by: Miguel Company <miguelcompany@eprosima.com>
1 parent 3e69d5a commit dd51de8

2 files changed

Lines changed: 26 additions & 5 deletions

File tree

‎.github/workflows/reusable-ubuntu-ci.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,48 +51,53 @@ defaults:
5151
jobs:
5252
shapes_demo_build:
5353
runs-on: ${{ inputs.os-version }}
54-
if: ${{ inputs.run-build == true }}
5554
strategy:
5655
fail-fast: false
5756
matrix:
5857
cmake-build-type:
5958
- 'RelWithDebInfo'
6059
steps:
6160
- name: Add ci-pending label if PR
62-
if: ${{ github.event_name == 'pull_request' }}
61+
if: ${{ inputs.run-build == true && github.event_name == 'pull_request' }}
6362
uses: eProsima/eProsima-CI/external/add_labels@v0
6463
with:
6564
labels: ci-pending
6665
number: ${{ github.event.number }}
6766
repo: eProsima/ShapesDemo
6867

6968
- name: Sync eProsima/ShapesDemo repository
69+
if: ${{ inputs.run-build == true }}
7070
uses: eProsima/eProsima-CI/external/checkout@v0
7171
with:
7272
path: src/ShapesDemo
7373
ref: ${{ inputs.shapes-demo-branch }}
7474

7575
- name: Install Fix Python version
76+
if: ${{ inputs.run-build == true }}
7677
uses: eProsima/eProsima-CI/external/setup-python@v0
7778
with:
7879
python-version: '3.11'
7980

8081
- name: Get minimum supported version of CMake
82+
if: ${{ inputs.run-build == true }}
8183
uses: eProsima/eProsima-CI/external/get-cmake@v0
8284
with:
8385
cmakeVersion: '3.22.6'
8486

8587
- name: Install apt dependencies
88+
if: ${{ inputs.run-build == true }}
8689
uses: eProsima/eProsima-CI/ubuntu/install_apt_packages@v0
8790
with:
8891
packages: libasio-dev libtinyxml2-dev libssl-dev
8992
update: false
9093
upgrade: false
9194

9295
- name: Install colcon
96+
if: ${{ inputs.run-build == true }}
9397
uses: eProsima/eProsima-CI/ubuntu/install_colcon@v0
9498

9599
- name: Install Python dependencies
100+
if: ${{ inputs.run-build == true }}
96101
uses: eProsima/eProsima-CI/multiplatform/install_python_packages@v0
97102
with:
98103
packages: vcstool xmlschema
@@ -101,6 +106,7 @@ jobs:
101106
# Do not setup python as it will internally modify the pythonLocation env variable
102107
# and we want to use a fix version
103108
- name: Install Qt
109+
if: ${{ inputs.run-build == true }}
104110
uses: eProsima/eProsima-CI/external/install_qt@v0
105111
with:
106112
version: '5.15.2'
@@ -109,26 +115,29 @@ jobs:
109115
setup-python: 'false'
110116

111117
- name: Setup CCache
118+
if: ${{ inputs.run-build == true && inputs.use-ccache == true }}
112119
uses: eProsima/eProsima-CI/external/setup-ccache-action@v0
113-
if: ${{ inputs.use-ccache == true }}
114120
with:
115121
api_token: ${{ secrets.GITHUB_TOKEN }}
116122

117123
- name: Get Fast DDS branch
118124
id: get_fastdds_branch
125+
if: ${{ inputs.run-build == true }}
119126
uses: eProsima/eProsima-CI/ubuntu/get_related_branch_from_repo@v0
120127
with:
121128
remote_repository: eProsima/Fast-DDS
122129
fallback_branch: ${{ inputs.fastdds-branch }}
123130

124131
- name: Download Fast DDS repo
132+
if: ${{ inputs.run-build == true }}
125133
uses: eProsima/eProsima-CI/external/checkout@v0
126134
with:
127135
repository: eProsima/Fast-DDS
128136
path: src/fastdds
129137
ref: ${{ steps.get_fastdds_branch.outputs.deduced_branch }}
130138

131139
- name: Fetch Fast DDS dependencies
140+
if: ${{ inputs.run-build == true }}
132141
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
133142
with:
134143
vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos
@@ -137,6 +146,7 @@ jobs:
137146

138147
- name: Colcon build
139148
continue-on-error: false
149+
if: ${{ inputs.run-build == true }}
140150
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
141151
with:
142152
colcon_meta_file: ${{ github.workspace }}/src/ShapesDemo/.github/workflows/config/build.meta

‎.github/workflows/reusable-windows-ci.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ defaults:
5151
jobs:
5252
shapes_demo_build:
5353
runs-on: ${{ inputs.os-version }}
54-
if: ${{ inputs.run-build == true }}
5554
strategy:
5655
fail-fast: false
5756
matrix:
@@ -60,35 +59,40 @@ jobs:
6059

6160
steps:
6261
- name: Add ci-pending label if PR
63-
if: ${{ github.event_name == 'pull_request' }}
62+
if: ${{ inputs.run-build == true && github.event_name == 'pull_request' }}
6463
uses: eProsima/eProsima-CI/external/add_labels@v0
6564
with:
6665
labels: ci-pending
6766
number: ${{ github.event.number }}
6867
repo: eProsima/ShapesDemo
6968

7069
- name: Sync eProsima/ShapesDemo repository
70+
if: ${{ inputs.run-build == true }}
7171
uses: eProsima/eProsima-CI/external/checkout@v0
7272
with:
7373
path: src/ShapesDemo
7474
ref: ${{ inputs.shapes-demo-branch }}
7575

7676
- name: Install Fix Python version
77+
if: ${{ inputs.run-build == true }}
7778
uses: eProsima/eProsima-CI/external/setup-python@v0
7879
with:
7980
python-version: '3.11'
8081

8182
- name: Get minimum supported version of CMake
83+
if: ${{ inputs.run-build == true }}
8284
uses: eProsima/eProsima-CI/external/get-cmake@v0
8385
with:
8486
cmakeVersion: '3.22.6'
8587

8688
- name: Install OpenSSL
89+
if: ${{ inputs.run-build == true }}
8790
uses: eProsima/eprosima-CI/windows/install_openssl@v0
8891
with:
8992
version: '3.1.1'
9093

9194
- name: Update OpenSSL environment variables
95+
if: ${{ inputs.run-build == true }}
9296
run: |
9397
# Update the environment
9498
if (Test-Path -Path $Env:ProgramW6432\OpenSSL)
@@ -110,16 +114,19 @@ jobs:
110114
}
111115
112116
- name: Install colcon
117+
if: ${{ inputs.run-build == true }}
113118
uses: eProsima/eProsima-CI/windows/install_colcon@v0
114119

115120
- name: Install Python dependencies
121+
if: ${{ inputs.run-build == true }}
116122
uses: eProsima/eProsima-CI/windows/install_python_packages@v0
117123
with:
118124
packages: vcstool xmlschema pywin32
119125

120126
# Do not setup python as it will internally modify the pythonLocation env variable
121127
# and we want to use a fix version
122128
- name: Install Qt
129+
if: ${{ inputs.run-build == true }}
123130
uses: eProsima/eProsima-CI/external/install_qt@v0
124131
with:
125132
version: '5.15.2'
@@ -130,19 +137,22 @@ jobs:
130137

131138
- name: Get Fast DDS branch
132139
id: get_fastdds_branch
140+
if: ${{ inputs.run-build == true }}
133141
uses: eProsima/eProsima-CI/multiplatform/get_related_branch_from_repo@v0
134142
with:
135143
remote_repository: eProsima/Fast-DDS
136144
fallback_branch: ${{ inputs.fastdds-branch }}
137145

138146
- name: Download Fast DDS repo
147+
if: ${{ inputs.run-build == true }}
139148
uses: eProsima/eProsima-CI/external/checkout@v0
140149
with:
141150
repository: eProsima/Fast-DDS
142151
path: src/fastdds
143152
ref: ${{ steps.get_fastdds_branch.outputs.deduced_branch }}
144153

145154
- name: Fetch Fast DDS dependencies
155+
if: ${{ inputs.run-build == true }}
146156
uses: eProsima/eProsima-CI/multiplatform/vcs_import@v0
147157
with:
148158
vcs_repos_file: ${{ github.workspace }}/src/fastdds/fastdds.repos
@@ -151,6 +161,7 @@ jobs:
151161

152162
- name: Colcon build
153163
continue-on-error: false
164+
if: ${{ inputs.run-build == true }}
154165
uses: eProsima/eProsima-CI/multiplatform/colcon_build@v0
155166
with:
156167
colcon_meta_file: ${{ github.workspace }}/src/ShapesDemo/.github/workflows/config/build.meta

0 commit comments

Comments
 (0)