Skip to content

Commit b2101c1

Browse files
author
Aliaksandr Adziareika
committed
Disable patches
1 parent 71e8b4f commit b2101c1

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed
File renamed without changes.

.github/patches/fix-linux-i386-audio-device-module-disable-warnings-as-errors.patch renamed to .github/patches/fix-linux-i386-audio-device-module-disable-warnings-as-errors.skip

File renamed without changes.

.github/patches/fix-linux-i386-compiler-flags-cmake.patch renamed to .github/patches/fix-linux-i386-compiler-flags-cmake.skip

File renamed without changes.

.github/patches/fix-opcua-bcrypt-asm-macro-fallback.patch renamed to .github/patches/fix-opcua-bcrypt-asm-macro-fallback.skip

File renamed without changes.

.github/workflows/ci-sandbox.yml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
exit 0
167167
fi
168168
for patch in _ci-sandbox/.github/patches/*.patch; do
169-
[ -f "$patch" ] && git apply "$patch" && echo "Applied: $patch"
169+
[ -f "$patch" ] && git apply "$patch" && echo "Applied: $patch" || true
170170
done
171171
172172
- name: Setup ccache
@@ -247,17 +247,29 @@ jobs:
247247
-DOPENDAQ_GENERATE_CSHARP_BINDINGS=OFF
248248
-DCMAKE_C_COMPILER_LAUNCHER=ccache
249249
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
250+
-DDAQMODULES_PARQUET_RECORDER_MODULE=ON
250251
disable-ccache : false
251252
enable_32bit: false
252253

253-
# - name: Ubuntu Latest gcc-9 Release
254-
# cc: gcc-9
255-
# cxx: g++-9
256-
# additional-packages: g++-9
257-
# cmake-generator: Ninja
258-
# cmake-build-type: Release
259-
# cmake-defines:
260-
# disable-ccache : true
254+
- name: Ubuntu Latest gcc-9 Release
255+
cc: gcc-9
256+
cxx: g++-9
257+
additional-packages: g++-9
258+
cmake-generator: Ninja
259+
cmake-build-type: Release
260+
cmake-defines: -DDAQMODULES_PARQUET_RECORDER_MODULE=ON
261+
disable-ccache : false
262+
enable_32bit: false
263+
264+
- name: Ubuntu Latest gcc-10 Release
265+
cc: gcc-10
266+
cxx: g++-10
267+
additional-packages: g++-10
268+
cmake-generator: Ninja
269+
cmake-build-type: Release
270+
cmake-defines: -DDAQMODULES_PARQUET_RECORDER_MODULE=ON
271+
disable-ccache : false
272+
enable_32bit: false
261273

262274
# - name: Ubuntu Latest gcc-14 Release
263275
# cc: gcc-14
@@ -344,7 +356,7 @@ jobs:
344356
exit 0
345357
fi
346358
for patch in _ci-sandbox/.github/patches/*.patch; do
347-
[ -f "$patch" ] && git apply "$patch" && echo "Applied: $patch"
359+
[ -f "$patch" ] && git apply "$patch" && echo "Applied: $patch" || true
348360
done
349361
350362
- name: Setup ccache
@@ -458,7 +470,7 @@ jobs:
458470
exit 0
459471
fi
460472
for patch in _ci-sandbox/.github/patches/*.patch; do
461-
[ -f "$patch" ] && git apply "$patch" && echo "Applied: $patch"
473+
[ -f "$patch" ] && git apply "$patch" && echo "Applied: $patch" || true
462474
done
463475
464476
- name: Setup ccache

0 commit comments

Comments
 (0)