From c6fcc8adfb9e47c83cdb77e14444ef72ee4e932b Mon Sep 17 00:00:00 2001 From: "Ronald Joseph Legarski, Jr." <98552991+solveforceapp@users.noreply.github.com> Date: Fri, 27 Jun 2025 20:30:06 -0700 Subject: [PATCH] Update build workflow and scripts --- .github/workflows/c-cpp.yml | 12 ++++-------- Build/libHttpClient.Linux/curl_Linux.bash | 4 +++- Build/libHttpClient.Linux/openssl_Linux.bash | 8 ++++++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 6a9c312e..1282f127 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -13,11 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: configure - run: ./configure - - name: make - run: make - - name: make check - run: make check - - name: make distcheck - run: make distcheck + - name: Fetch submodules + run: git submodule update --init --recursive + - name: Build libHttpClient + run: bash Build/libHttpClient.Linux/libHttpClient_Linux.bash -c Release -sg diff --git a/Build/libHttpClient.Linux/curl_Linux.bash b/Build/libHttpClient.Linux/curl_Linux.bash index ecf30432..c59d17c3 100644 --- a/Build/libHttpClient.Linux/curl_Linux.bash +++ b/Build/libHttpClient.Linux/curl_Linux.bash @@ -45,5 +45,7 @@ make mkdir -p "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libcurl.Linux cp -R "$PWD"/lib/.libs/* "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libcurl.Linux -make clean +if [ -f Makefile ] && make -n clean >/dev/null 2>&1; then + make clean +fi popd diff --git a/Build/libHttpClient.Linux/openssl_Linux.bash b/Build/libHttpClient.Linux/openssl_Linux.bash index fafce0e9..f398c546 100644 --- a/Build/libHttpClient.Linux/openssl_Linux.bash +++ b/Build/libHttpClient.Linux/openssl_Linux.bash @@ -50,7 +50,9 @@ else fi pushd $OPENSSL_SRC -make clean +if [ -f Makefile ] && make -n clean >/dev/null 2>&1; then + make clean +fi sed -i -e 's/\r$//' Configure if [ "$CONFIGURATION" = "Debug" ]; then @@ -70,5 +72,7 @@ cp -R "$PWD"/libcrypto.a "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libcrypto. mkdir -p "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libssl.Linux cp -R "$PWD"/libssl.a "$SCRIPT_DIR"/../../Out/x64/"$CONFIGURATION"/libssl.Linux -make clean +if [ -f Makefile ] && make -n clean >/dev/null 2>&1; then + make clean +fi popd