Skip to content

Commit 482bf98

Browse files
committed
enable python-debug for centos as well
can't reproduce ubuntu fail on fedora locally enable python-debug for centos as well can't reproduce ubuntu fail on fedora locally enable python-debug for fedora as well can't reproduce ubuntu fail on fedora locally enable python-debug for fedora as well can't reproduce ubuntu fail on fedora locally enable python-debug for fedora as well can't reproduce ubuntu fail on fedora locally
1 parent 314364b commit 482bf98

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

.github/workflows/build.yaml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ jobs:
311311
containerTag: ['37']
312312
buildType: [RelWithDebInfo]
313313
runtimeCheck: [asan, tsan]
314+
python: [/usr/bin/python3.10d]
314315
protonGitRef:
315316
- ${{ github.event.inputs.protonBranch || 'main' }}
316317
- 0.38.0
@@ -322,27 +323,31 @@ jobs:
322323
container: 'centos'
323324
containerTag: stream8
324325
runtimeCheck: OFF
326+
python: /usr/bin/python3.6-debug
325327
protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }}
326328
shard: 1
327329
shards: 2
328330
- os: ubuntu-20.04
329331
container: 'centos'
330332
containerTag: stream8
331333
runtimeCheck: OFF
334+
python: /usr/bin/python3.6-debug
332335
protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }}
333336
shard: 2
334337
shards: 2
335338
- os: ubuntu-20.04
336339
container: 'centos'
337340
containerTag: stream8
338341
runtimeCheck: OFF
342+
python: /usr/bin/python3.6-debug
339343
protonGitRef: 0.38.0
340344
shard: 1
341345
shards: 2
342346
- os: ubuntu-20.04
343347
container: 'centos'
344348
containerTag: stream8
345349
runtimeCheck: OFF
350+
python: /usr/bin/python3.6-debug
346351
protonGitRef: 0.38.0
347352
shard: 2
348353
shards: 2
@@ -386,10 +391,11 @@ jobs:
386391
-DENABLE_FUZZ_TESTING=OFF
387392
-DRUNTIME_CHECK=${{matrix.runtimeCheck}}
388393
-DBUILD_TLS=ON
394+
-DPython_EXECUTABLE=${{matrix.python}}
389395
RouterCMakeExtraArgs: >
390396
-DCMAKE_C_COMPILER_LAUNCHER=ccache
391397
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
392-
-DPython_EXECUTABLE=/usr/bin/python3
398+
-DPython_EXECUTABLE=${{matrix.python}}
393399
-DRUNTIME_CHECK=${{matrix.runtimeCheck}}
394400
395401
CCACHE_BASEDIR: ${{github.workspace}}
@@ -431,10 +437,10 @@ jobs:
431437
432438
- name: Install Linux build dependencies
433439
run: |
434-
dnf install -y gcc gcc-c++ elfutils-devel cmake libuuid-devel openssl openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-pip make libwebsockets-devel libnghttp2-devel ccache libasan libubsan libtsan
440+
dnf install -y gcc gcc-c++ elfutils-devel cmake libuuid-devel openssl openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-debug python3-pip make libwebsockets-devel libnghttp2-devel ccache libasan libubsan libtsan
435441
436442
- name: Install Python build dependencies
437-
run: python3 -m pip install setuptools wheel tox
443+
run: ${{matrix.python}} -m pip install setuptools wheel tox
438444

439445
# https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/
440446
- name: Prepare ccache timestamp
@@ -507,16 +513,24 @@ jobs:
507513
- name: Upgrade pip
508514
run: python3 -m pip install --upgrade pip
509515

516+
- name: CentOS 8 python3.6-debug needs this to build pip packages from source in next step
517+
if: ${{ matrix.container == 'centos' }}
518+
run: |
519+
dnf install -y libxml2-devel libxslt-devel
520+
510521
- name: Install Python runtime/test dependencies
511-
run: python3 -m pip install -r ${{github.workspace}}/skupper-router/requirements-dev.txt
522+
run: ${{matrix.python}} -m pip install -r ${{github.workspace}}/skupper-router/requirements-dev.txt
512523

513524
- name: Install Linux runtime/test dependencies
514525
run: |
515526
dnf install -y curl nmap-ncat gdb binutils elfutils elfutils-debuginfod-client findutils file
516527
dnf debuginfo-install -y python3
517528
529+
- name: Replace /usr/bin/python3 with ${{matrix.python}}, for tools such as skmanage
530+
run: sudo ln -sf ${{matrix.python}} /usr/bin/python3
531+
518532
- name: install qpid-proton python wheel
519-
run: python3 -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
533+
run: ${{matrix.python}} -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
520534

521535
- name: CTest
522536
working-directory: ${{env.RouterBuildDir}}

0 commit comments

Comments
 (0)