Skip to content

Commit 763aebc

Browse files
committed
Refs #23483. Support swig-version
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent df19117 commit 763aebc

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ on:
5757
required: false
5858
type: boolean
5959
default: true
60+
swig-version:
61+
description: 'SWIG version to install'
62+
required: false
63+
default: '4.0.2.04082020'
64+
type: string
6065
env:
6166
colcon-build-default-cmake-args: '-DTHIRDPARTY_Asio=FORCE -DTHIRDPARTY_TinyXML2=FORCE -DTHIRDPARTY_fastcdr=OFF -DTHIRDPARTY_UPDATE=ON -DEPROSIMA_EXTRA_CMAKE_CXX_FLAGS="/MP /WX"'
6267
defaults:
@@ -134,7 +139,7 @@ jobs:
134139

135140
- name: Install swig
136141
shell: pwsh
137-
run: choco install swig --allow-downgrade --version=4.0.2.04082020
142+
run: choco install swig --allow-downgrade --version=${{ inputs.swig-version }}
138143

139144
- name: Get Fast CDR branch
140145
id: get_fastcdr_branch
@@ -215,7 +220,7 @@ jobs:
215220
- name: Get minimum supported version of CMake
216221
uses: eProsima/eProsima-CI/external/get-cmake@v0
217222
with:
218-
cmakeVersion: '3.24.4'
223+
cmakeVersion: ${{ inputs.cmake-version }}
219224

220225
- name: Install OpenSSL
221226
uses: eProsima/eprosima-CI/windows/install_openssl@v0
@@ -253,7 +258,7 @@ jobs:
253258

254259
- name: Install swig
255260
shell: pwsh
256-
run: choco install swig --allow-downgrade --version=4.0.2.04082020
261+
run: choco install swig --allow-downgrade --version=${{ inputs.swig-version }}
257262

258263
- name: Install doxygen
259264
uses: eProsima/eProsima-CI/external/install_doxygen@v0

.github/workflows/windows-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ jobs:
8989
fastdds-branch: ${{ inputs.fastdds-branch || 'master' }}
9090
run-build: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
9191
run-tests: ${{ (inputs.run-tests == true) || ((github.event_name == 'pull_request') && (!contains(github.event.pull_request.labels.*.name, 'no-test'))) }}
92+
swig-version: '4.3.1'

0 commit comments

Comments
 (0)