Update 2 files
This commit is contained in:
@ -84,9 +84,11 @@ if git rev-parse "$TAG" >/dev/null 2>&1; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Check if tag exists on remote
|
# Check if tag exists on remote
|
||||||
|
TAG_EXISTS_ON_REMOTE=false
|
||||||
if git ls-remote --tags origin | grep -q "refs/tags/$TAG"; then
|
if git ls-remote --tags origin | grep -q "refs/tags/$TAG"; then
|
||||||
echo "Tag $TAG already exists on remote - this is expected for multi-architecture builds"
|
echo "Tag $TAG already exists on remote - this is expected for multi-architecture builds"
|
||||||
echo "Skipping tag creation and proceeding with release attachment..."
|
echo "Skipping tag creation and proceeding with release attachment..."
|
||||||
|
TAG_EXISTS_ON_REMOTE=true
|
||||||
else
|
else
|
||||||
echo "Creating new tag $TAG..."
|
echo "Creating new tag $TAG..."
|
||||||
git tag -a "$TAG" -m "Release $TAG"
|
git tag -a "$TAG" -m "Release $TAG"
|
||||||
|
@ -31,21 +31,14 @@ COPY src/ src/
|
|||||||
RUN --mount=type=cache,target=/ccache \
|
RUN --mount=type=cache,target=/ccache \
|
||||||
--mount=type=cache,target=/build \
|
--mount=type=cache,target=/build \
|
||||||
mkdir -p /build && \
|
mkdir -p /build && \
|
||||||
SSL_LIB=$(find /usr/local -name "libssl.a" | head -1) && \
|
|
||||||
CRYPTO_LIB=$(find /usr/local -name "libcrypto.a" | head -1) && \
|
|
||||||
echo "Found SSL: $SSL_LIB, Crypto: $CRYPTO_LIB" && \
|
|
||||||
cmake -G Ninja -S /app -B /build \
|
cmake -G Ninja -S /app -B /build \
|
||||||
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
|
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
|
||||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||||
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
||||||
-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static -g" \
|
-DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static -g" \
|
||||||
-DCMAKE_CXX_FLAGS="-g -fno-omit-frame-pointer" \
|
-DCMAKE_CXX_FLAGS="-g -fno-omit-frame-pointer" \
|
||||||
-DCMAKE_C_FLAGS="-g -fno-omit-frame-pointer" \
|
|
||||||
-DPROJECT_NAME="${PROJECT}" \
|
-DPROJECT_NAME="${PROJECT}" \
|
||||||
-DCMAKE_STRIP=OFF \
|
-DCMAKE_STRIP=OFF \
|
||||||
-DOPENSSL_SSL_LIBRARY="$SSL_LIB" \
|
|
||||||
-DOPENSSL_CRYPTO_LIBRARY="$CRYPTO_LIB" \
|
|
||||||
-DOPENSSL_INCLUDE_DIR=/usr/local/include \
|
|
||||||
${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
|
${CMAKE_TOOLCHAIN_FILE:+-DCMAKE_TOOLCHAIN_FILE=$CMAKE_TOOLCHAIN_FILE}
|
||||||
|
|
||||||
# Run prebuild script
|
# Run prebuild script
|
||||||
|
Reference in New Issue
Block a user