Skip to content

Commit 19fae09

Browse files
committed
DISPATCH-2144 Use python3-dbg in the Debug GHA build
1 parent 4f7b5bf commit 19fae09

File tree

1 file changed

+14
-22
lines changed

1 file changed

+14
-22
lines changed

.github/workflows/build.yaml

+14-22
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
buildType: [Debug]
3333
runtimeCheck: [asan]
3434
protonGitRef: [main, 0.36.0]
35+
python: [/usr/bin/python3-dbg]
3536
env:
3637
BuildType: ${{matrix.buildType}}
3738
ProtonBuildDir: ${{github.workspace}}/qpid-proton/build
@@ -47,6 +48,7 @@ jobs:
4748
-DBUILD_TESTING=OFF
4849
-DENABLE_FUZZ_TESTING=OFF
4950
-DRUNTIME_CHECK=${{matrix.runtimeCheck}}
51+
-DPython_EXECUTABLE=${{matrix.python}}
5052
DispatchCMakeExtraArgs: >
5153
-DCMAKE_C_COMPILER_LAUNCHER=ccache
5254
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
@@ -56,6 +58,7 @@ jobs:
5658
-DRUNTIME_CHECK=${{matrix.runtimeCheck}}
5759
-DSANITIZE_3RD_PARTY=ON
5860
-DBUILD_BENCHMARKS=ON
61+
-DPython_EXECUTABLE=${{matrix.python}}
5962
6063
CCACHE_BASEDIR: ${{github.workspace}}
6164
CCACHE_DIR: ${{github.workspace}}/.ccache
@@ -97,19 +100,13 @@ jobs:
97100
- name: Create Build and Install directories
98101
run: mkdir -p "${ProtonBuildDir}" "${DispatchBuildDir}" "${InstallPrefix}"
99102

100-
- name: Setup python
101-
uses: actions/setup-python@v2
102-
with:
103-
python-version: 3.6
104-
architecture: x64
105-
106-
- name: Install Python build dependencies
107-
run: python -m pip install setuptools wheel tox
108-
109103
- name: Install Linux build dependencies
110104
if: ${{ runner.os == 'Linux' }}
111105
run: |
112-
sudo apt update; sudo apt install -y swig libpython3-dev libsasl2-dev libjsoncpp-dev libwebsockets-dev libnghttp2-dev ccache ninja-build pixz libbenchmark-dev
106+
sudo apt update; sudo apt install -y swig python3-dbg libpython3-dbg libsasl2-dev libjsoncpp-dev libwebsockets-dev libnghttp2-dev ccache ninja-build pixz libbenchmark-dev
107+
108+
- name: Install Python build dependencies
109+
run: ${{matrix.python}} -m pip install setuptools wheel tox
113110

114111
- name: Zero ccache stats
115112
run: ccache -z
@@ -177,6 +174,7 @@ jobs:
177174
buildType: [Debug]
178175
runtimeCheck: [asan]
179176
protonGitRef: [main, 0.36.0]
177+
python: [/usr/bin/python3-dbg]
180178
shard: [1, 2]
181179
shards: [2]
182180
env:
@@ -200,25 +198,19 @@ jobs:
200198
with:
201199
name: qpid_dispatch_wrk_${{matrix.os}}_${{matrix.buildType}}_${{matrix.runtimeCheck}}_${{matrix.protonGitRef}}
202200

203-
- name: Setup python
204-
uses: actions/setup-python@v2
205-
with:
206-
python-version: 3.6
207-
architecture: x64
208-
209-
- name: Install Python runtime/test dependencies
210-
run: python -m pip install tox quart selectors h2 grpcio protobuf websockets pytest
211-
212201
- name: Install Linux runtime/test dependencies
213202
if: ${{ runner.os == 'Linux' }}
214203
run: |
215-
sudo apt update; sudo apt install -y libsasl2-2 libsasl2-modules sasl2-bin libjsoncpp1 libwebsockets15 libbenchmark1 pixz bubblewrap curl
204+
sudo apt update; sudo apt install -y python3-dbg libsasl2-2 libsasl2-modules sasl2-bin libjsoncpp1 libwebsockets15 libbenchmark1 pixz bubblewrap curl
216205
217206
- name: Unpack archive
218207
run: tar -I pixz -xf archive.tar.xz
219208

220-
- name: install qpid-proton python wheel
221-
run: python -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
209+
- name: Install Python runtime/test dependencies
210+
run: ${{matrix.python}} -m pip install tox quart selectors h2 grpcio protobuf websockets pytest
211+
212+
- name: Install qpid-proton python wheel
213+
run: ${{matrix.python}} -m pip install ${ProtonBuildDir}/python/pkgs/python_qpid_proton*.whl
222214

223215
- name: CTest
224216
working-directory: ${{env.DispatchBuildDir}}

0 commit comments

Comments
 (0)