File tree Expand file tree Collapse file tree 2 files changed +13
-14
lines changed
Expand file tree Collapse file tree 2 files changed +13
-14
lines changed Original file line number Diff line number Diff line change @@ -100,18 +100,15 @@ runs:
100100
101101 if [ "$ENABLE_32BIT" == "true" ]; then
102102 sudo dpkg --add-architecture i386
103- DEV_PACKAGES=("${DEV_PACKAGES[@]/%/:i386}" python3:i386 python3-dev:i386 python3-pip)
103+ DEV_PACKAGES=("${DEV_PACKAGES[@]/%/:i386}" python3:i386 python3-dev:i386 gcc-multilib g++-multilib \
104+ libx11-6:i386 libxrandr2:i386 libxcursor1:i386 libxi6:i386 libgl1:i386)
104105 fi
105106
106107 sudo apt-get update && sudo apt-get install -y --no-install-recommends \
107108 ${{ inputs.additional-dependencies || '' }} \
108109 lld mono-runtime libmono-system-json-microsoft4.0-cil libmono-system-data4.0-cil \
109110 "${DEV_PACKAGES[@]}"
110111
111- if [ "$ENABLE_32BIT" == "true" ]; then
112- sudo ln -sf /usr/bin/python3 /usr/bin/python
113- fi
114-
115112 - name : Install macOS dependencies
116113 if : runner.os == 'macOS'
117114 shell : bash
@@ -148,16 +145,11 @@ runs:
148145 uses : ./.github/actions/setup-compiler-icx
149146
150147 - name : Install Python dependencies
148+ if : ${{ !(inputs.enable-32bit == 'true' && runner.os == 'Linux') }}
151149 shell : bash
152- env :
153- ENABLE_32BIT : ${{ inputs.enable-32bit }}
154150 run : |
155151 echo "Installing numpy for Python: $(python --version)"
156- PIP_FLAGS=""
157- if [ "$ENABLE_32BIT" == "true" ] && [ "$RUNNER_OS" == "Linux" ]; then
158- PIP_FLAGS="--break-system-packages"
159- fi
160- python -m pip install numpy $PIP_FLAGS
152+ python -m pip install numpy
161153 echo "Done installing Python dependencies"
162154
163155 - name : Configure
Original file line number Diff line number Diff line change @@ -224,7 +224,14 @@ jobs:
224224 additional-packages : g++-9
225225 cmake-generator : Ninja
226226 cmake-build-type : Release
227- cmake-defines :
227+ cmake-defines : >-
228+ -DOPENDAQ_GENERATE_PYTHON_BINDINGS=OFF
229+ -DOPENDAQ_GENERATE_CSHARP_BINDINGS=OFF
230+ -DCMAKE_LIBRARY_PATH=/usr/lib/i386-linux-gnu
231+ -DCMAKE_C_FLAGS_INIT=-m32
232+ -DCMAKE_CXX_FLAGS_INIT=-m32
233+ -DCMAKE_SYSTEM_PROCESSOR=i686
234+ -DCMAKE_SIZEOF_VOID_P=4
228235 disable-ccache : true
229236 enable_32bit : true
230237
@@ -363,7 +370,7 @@ jobs:
363370 # TODO: End of sandbox-only steps
364371
365372 - name : Upload test results
366- if : always()
373+ if : always() && steps.build-and-test.outputs.gtest-xml-path != ''
367374 uses : actions/upload-artifact@v4
368375 with :
369376 name : Unit Test Results (${{ matrix.name }})
You can’t perform that action at this time.
0 commit comments