From 3f68f44e3da8fdf522acf7e7f2892faca2c23ef6 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 29 Jun 2025 20:28:25 +1200 Subject: [PATCH] Update 2 files --- bb64/publish.sh | 2 ++ getpkg/Dockerfile.dropshell-build | 7 ------- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/bb64/publish.sh b/bb64/publish.sh index d4a0025..342c91c 100755 --- a/bb64/publish.sh +++ b/bb64/publish.sh @@ -84,9 +84,11 @@ if git rev-parse "$TAG" >/dev/null 2>&1; then fi # Check if tag exists on remote +TAG_EXISTS_ON_REMOTE=false 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 "Skipping tag creation and proceeding with release attachment..." + TAG_EXISTS_ON_REMOTE=true else echo "Creating new tag $TAG..." git tag -a "$TAG" -m "Release $TAG" diff --git a/getpkg/Dockerfile.dropshell-build b/getpkg/Dockerfile.dropshell-build index a849af7..7ae575e 100644 --- a/getpkg/Dockerfile.dropshell-build +++ b/getpkg/Dockerfile.dropshell-build @@ -31,21 +31,14 @@ COPY src/ src/ RUN --mount=type=cache,target=/ccache \ --mount=type=cache,target=/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 \ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_EXE_LINKER_FLAGS="-fuse-ld=mold -static -g" \ -DCMAKE_CXX_FLAGS="-g -fno-omit-frame-pointer" \ - -DCMAKE_C_FLAGS="-g -fno-omit-frame-pointer" \ -DPROJECT_NAME="${PROJECT}" \ -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} # Run prebuild script