Skip to content

Commit 1c13386

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 28fbffb commit 1c13386

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
@@ -314,6 +314,7 @@ jobs:
314314
containerTag: ['35']
315315
buildType: [RelWithDebInfo]
316316
runtimeCheck: [asan, tsan]
317+
python: [/usr/bin/python3.10d]
317318
protonGitRef:
318319
- ${{ github.event.inputs.protonBranch || 'main' }}
319320
- 0.37.0
@@ -325,27 +326,31 @@ jobs:
325326
container: 'centos'
326327
containerTag: stream8
327328
runtimeCheck: OFF
329+
python: /usr/bin/python3.6-debug
328330
protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }}
329331
shard: 1
330332
shards: 2
331333
- os: ubuntu-20.04
332334
container: 'centos'
333335
containerTag: stream8
334336
runtimeCheck: OFF
337+
python: /usr/bin/python3.6-debug
335338
protonGitRef: ${{ github.event.inputs.protonBranch || 'main' }}
336339
shard: 2
337340
shards: 2
338341
- os: ubuntu-20.04
339342
container: 'centos'
340343
containerTag: stream8
341344
runtimeCheck: OFF
345+
python: /usr/bin/python3.6-debug
342346
protonGitRef: 0.37.0
343347
shard: 1
344348
shards: 2
345349
- os: ubuntu-20.04
346350
container: 'centos'
347351
containerTag: stream8
348352
runtimeCheck: OFF
353+
python: /usr/bin/python3.6-debug
349354
protonGitRef: 0.37.0
350355
shard: 2
351356
shards: 2
@@ -389,10 +394,11 @@ jobs:
389394
-DENABLE_FUZZ_TESTING=OFF
390395
-DRUNTIME_CHECK=${{matrix.runtimeCheck}}
391396
-DBUILD_TLS=ON
397+
-DPython_EXECUTABLE=${{matrix.python}}
392398
RouterCMakeExtraArgs: >
393399
-DCMAKE_C_COMPILER_LAUNCHER=ccache
394400
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
395-
-DPython_EXECUTABLE=/usr/bin/python3
401+
-DPython_EXECUTABLE=${{matrix.python}}
396402
-DRUNTIME_CHECK=${{matrix.runtimeCheck}}
397403
398404
CCACHE_BASEDIR: ${{github.workspace}}
@@ -438,10 +444,10 @@ jobs:
438444

439445
- name: Install Linux build dependencies
440446
run: |
441-
dnf install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-pip make libwebsockets-devel libnghttp2-devel ccache libasan libubsan libtsan
447+
dnf install -y gcc gcc-c++ cmake libuuid-devel openssl-devel cyrus-sasl-devel cyrus-sasl-plain swig python3-devel python3-debug python3-pip make libwebsockets-devel libnghttp2-devel ccache libasan libubsan libtsan
442448
443449
- name: Install Python build dependencies
444-
run: python3 -m pip install setuptools wheel tox
450+
run: ${{matrix.python}} -m pip install setuptools wheel tox
445451

446452
# https://cristianadam.eu/20200113/speeding-up-c-plus-plus-github-actions-using-ccache/
447453
- name: Prepare ccache timestamp
@@ -514,16 +520,24 @@ jobs:
514520
- name: Upgrade pip
515521
run: python3 -m pip install --upgrade pip
516522

523+
- name: CentOS 8 python3.6-debug needs this to build pip packages from source in next step
524+
if: ${{ matrix.container == 'centos' }}
525+
run: |
526+
dnf install -y libxml2-devel libxslt-devel
527+
517528
- name: Install Python runtime/test dependencies
518-
run: python3 -m pip install -r ${{github.workspace}}/skupper-router/requirements-dev.txt
529+
run: ${{matrix.python}} -m pip install -r ${{github.workspace}}/skupper-router/requirements-dev.txt
519530

520531
- name: Install Linux runtime/test dependencies
521532
run: |
522533
dnf install -y curl nmap-ncat gdb binutils elfutils elfutils-debuginfod-client findutils file
523534
dnf debuginfo-install -y python3
524535
536+
- name: Replace /usr/bin/python3 with ${{matrix.python}}, for tools such as skmanage
537+
run: sudo ln -sf ${{matrix.python}} /usr/bin/python3
538+
525539
- name: install qpid-proton python wheel
526-
run: python3 -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
540+
run: ${{matrix.python}} -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
527541

528542
- name: CTest
529543
working-directory: ${{env.RouterBuildDir}}

0 commit comments

Comments
 (0)