Revert "Simplify offline build (valkey-io#73)" (valkey-io#93)

This reverts commit ac5a0e4.

Signed-off-by: Roshan Khatri <rvkhatri@amazon.com>

Author: roshkhatri

.github/workflows/ci.yml

@@ -8,37 +8,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        server_version: ["unstable", "8.0", "8.1", "9.0"]
+        server_version: ['unstable', '8.0', '8.1', '9.0']
     steps:
-      - name: Checkout valkey
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          repository: valkey-io/valkey
-          ref: ${{ matrix.server_version }}
-          path: valkey
-
-      - name: Set VALKEY_INCLUDE_DIR
-        working-directory: valkey
-        run: echo "VALKEY_INCLUDE_DIR=$(pwd)/src" >> $GITHUB_ENV
-
-      - name: Checkout valkey-json
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-        with:
-          path: valkey-json
-
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set the server version
         run: echo "SERVER_VERSION=${{ matrix.server_version }}" >> $GITHUB_ENV
-
       - name: Build release
-        working-directory: valkey-json
         run: ./build.sh
 
   unit-tests:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        server_version: ["unstable", "8.0", "8.1", "9.0"]
+        server_version: ['unstable', '8.0', '8.1', '9.0']
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set the server version
@@ -51,15 +34,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        server_version: ["unstable", "8.0", "8.1", "9.0"]
+        server_version: ['unstable', '8.0', '8.1', '9.0']
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set the server version
         run: echo "SERVER_VERSION=${{ matrix.server_version }}" >> $GITHUB_ENV
       - name: Set up Python
         uses: actions/setup-python@3542bca2639a428e1796aaa6a2ffef0c0f575566 # v3.1.4
         with:
-          python-version: "3.9"
+          python-version: '3.9'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -72,15 +55,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        server_version: ["unstable", "8.0", "8.1", "9.0"]
+        server_version: ['unstable', '8.0', '8.1', '9.0']
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - name: Set the server version
         run: echo "SERVER_VERSION=${{ matrix.server_version }}" >> $GITHUB_ENV
       - name: Set up Python
         uses: actions/setup-python@3542bca2639a428e1796aaa6a2ffef0c0f575566 # v3.1.4
         with:
-          python-version: "3.9"
+          python-version: '3.9'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip

CMakeLists.txt

@@ -100,39 +100,31 @@ else()
     endif()
 endif()
 
-if(VALKEY_INCLUDE_DIR)
-    if(ENABLE_UNIT_TESTS OR ENABLE_INTEGRATION_TESTS)
-        message(FATAL_ERROR "Incompatible option VALKEY_INCLUDE_DIR with ENABLE_UNIT_TESTS or ENABLE_INTEGRATION_TESTS")
-    endif()
-    file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src/include")
-    file(COPY_FILE "${VALKEY_INCLUDE_DIR}/valkeymodule.h" "${CMAKE_CURRENT_SOURCE_DIR}/src/include/valkeymodule.h")
-else()
-    ExternalProject_Add(
-        valkey
-        GIT_REPOSITORY https://github.com/valkey-io/valkey.git
-        GIT_TAG ${VALKEY_VERSION}
-        PREFIX ${VALKEY_DOWNLOAD_DIR}
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ${VALKEY_BUILD_CMD}
-        INSTALL_COMMAND ""
-        BUILD_IN_SOURCE 1
-    )
-
-    # Define the paths for the copied files
-    set(VALKEY_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/include")
-    set(VALKEY_BINARY_DEST "${CMAKE_CURRENT_SOURCE_DIR}/tst/integration/.build/binaries/${VALKEY_VERSION}")
+ExternalProject_Add(
+    valkey
+    GIT_REPOSITORY https://github.com/valkey-io/valkey.git
+    GIT_TAG ${VALKEY_VERSION}
+    PREFIX ${VALKEY_DOWNLOAD_DIR}
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ${VALKEY_BUILD_CMD}
+    INSTALL_COMMAND ""
+    BUILD_IN_SOURCE 1
+)
 
-    ExternalProject_Add_Step(
-        valkey
-        copy_header_files
-        COMMENT "Copying header files to include/ directory"
-        DEPENDEES download
-        DEPENDERS configure
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${VALKEY_INCLUDE_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy ${VALKEY_DOWNLOAD_DIR}/src/valkey/src/valkeymodule.h ${VALKEY_INCLUDE_DIR}/valkeymodule.h
-        ALWAYS 1
-    )
-endif()
+# Define the paths for the copied files
+set(VALKEY_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/include")
+set(VALKEY_BINARY_DEST "${CMAKE_CURRENT_SOURCE_DIR}/tst/integration/.build/binaries/${VALKEY_VERSION}")
+
+ExternalProject_Add_Step(
+    valkey
+    copy_header_files
+    COMMENT "Copying header files to include/ directory"
+    DEPENDEES download
+    DEPENDERS configure
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${VALKEY_INCLUDE_DIR}
+    COMMAND ${CMAKE_COMMAND} -E copy ${VALKEY_DOWNLOAD_DIR}/src/valkey/src/valkeymodule.h ${VALKEY_INCLUDE_DIR}/valkeymodule.h
+    ALWAYS 1
+)
 
 # Integration tests require the valkey-test-framework which is only needed when
 # building Valkey from source.
@@ -210,18 +202,11 @@ message("CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
 message("CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
 
 # Fetch RapidJSON
-if(RAPIDJSON_SOURCE_DIR)
-    FetchContent_Declare(
-        rapidjson
-        SOURCE_DIR "${RAPIDJSON_SOURCE_DIR}"
-    )
-else()
-    FetchContent_Declare(
-        rapidjson
-        GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
-        GIT_TAG ebd87cb468fb4cb060b37e579718c4a4125416c1
-    )
-endif()
+FetchContent_Declare(
+    rapidjson
+    GIT_REPOSITORY https://github.com/Tencent/rapidjson.git
+    GIT_TAG ebd87cb468fb4cb060b37e579718c4a4125416c1
+)
 
 # Disable RapidJSON tests and examples
 set(RAPIDJSON_BUILD_TESTS OFF CACHE BOOL "Build rapidjson tests" FORCE)

build.sh

@@ -109,10 +109,6 @@ fi
 
 CMAKE_FLAGS="$CMAKE_FLAGS -DENABLE_UNIT_TESTS=${ENABLE_UNIT_TESTS} -DENABLE_INTEGRATION_TESTS=${ENABLE_INTEGRATION_TESTS} -DBUILD_RELEASE=${ENABLE_BUILD_RELEASE}"
 
-if [ -n "${VALKEY_INCLUDE_DIR}" ]; then
-    CMAKE_FLAGS="$CMAKE_FLAGS -DVALKEY_INCLUDE_DIR=${VALKEY_INCLUDE_DIR}"
-fi
-
 if [ -z "${CFLAGS}" ]; then
     cmake .. -DVALKEY_VERSION=${SERVER_VERSION} ${CMAKE_FLAGS}
 else

src/CMakeLists.txt

@@ -40,7 +40,4 @@ target_sources(${OBJECT_TARGET}
 )
 
 add_library(${JSON_MODULE_LIB} SHARED $<TARGET_OBJECTS:${OBJECT_TARGET}>)
-
-if(ENABLE_UNIT_TESTS OR ENABLE_INTEGRATION_TESTS)
-	add_dependencies(${OBJECT_TARGET} valkey)
-endif()
+add_dependencies(${OBJECT_TARGET} valkey)