Skip to content

Commit 58c3d0a

Browse files
committed
Fix
1 parent 74aa2f9 commit 58c3d0a

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

pkg/apk/APKBUILD

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,19 +43,12 @@ build() {
4343
if [[ $PLATFORM == "aarch64" ]]; then
4444
export VCPKG_FORCE_SYSTEM_BINARIES=1
4545
fi
46-
set +e
46+
set -e
4747
cmake -B build -DINTEGRATE_VCPKG=ON -DCMAKE_BUILD_TYPE=Release \
4848
-DCMAKE_MAKE_PROGRAM=make \
4949
-DCMAKE_INSTALL_PREFIX="$pkgdir" \
5050
-DBUILD_TESTS=OFF -DBUILD_DYNAMIC_LIB=ON -DBUILD_STATIC_LIB=ON \
5151
$ROOT_DIR
52-
if [[ $? -ne 0 ]]; then
53-
cat /pulsar-client-cpp/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-CMakeCache.txt.log
54-
cat /pulsar-client-cpp/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-out.log
55-
cat /pulsar-client-cpp/vcpkg/buildtrees/detect_compiler/config-x64-linux-rel-err.log
56-
exit 1
57-
fi
58-
set -e
5952
cmake --build build -j8
6053
}
6154

pkg/apk/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ RUN apk add \
3636
ninja \
3737
zip \
3838
unzip \
39-
openssl-dev
39+
openssl-dev \
40+
sudo

pkg/apk/build-apk.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export VERSION=`echo $POM_VERSION | sed -E 's/\-[a-zA-Z]+//'`
3636

3737
echo "VERSION: $VERSION"
3838

39-
abuild-keygen -a -i -n
40-
abuild -F -c -r
39+
sudo abuild-keygen -a -i -n
40+
sudo abuild -F -c -r
4141

4242
cp -r /root/packages/pkg ./build

0 commit comments

Comments
 (0)