diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f0c5ddc..0d270711 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -90,11 +90,6 @@ jobs: - name: Enable Developer Command Prompt uses: ilammy/msvc-dev-cmd@v1.13.0 - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.9 - with: - disable_annotations: true - - name: CMake Build run: cmake --preset=release && cmake --build --preset=release -t dump-apiset @@ -275,27 +270,6 @@ jobs: ndk-version: r26d add-to-path: false - - name: Setup sccache environment - shell: bash - run: | - WORKSPACE_PATH="${{github.workspace}}" - WORKSPACE_PATH="${WORKSPACE_PATH//\\//}" - echo "SCCACHE_DIR=${WORKSPACE_PATH}/sccache" >> $GITHUB_ENV - echo "SCCACHE_CACHE_SIZE=200M" >> $GITHUB_ENV - - - name: Recover sccache - uses: actions/cache/restore@v3 - with: - path: ${{env.SCCACHE_DIR}} - key: sccache-${{github.job}}-${{matrix.platform}}-${{matrix.configuration}}-${{ github.head_ref || github.ref_name }}- - restore-keys: | - sccache-${{github.job}}-${{matrix.platform}}-${{matrix.configuration}}-${{ github.event.repository.default_branch }}- - - - name: Install sccache - uses: mozilla-actions/sccache-action@v0.0.9 - with: - disable_annotations: true - - name: Setup Android Environment Variables shell: bash if: ${{ startsWith(matrix.platform, 'Android') }} @@ -321,15 +295,6 @@ jobs: path: "build/${{matrix.preset}}/**/CTestTestfile.cmake" retention-days: 1 - - name: Print sccache stats - run: sccache -s && sccache --stop-server - - - name: Save sccache - uses: actions/cache/save@v3 - with: - path: ${{env.SCCACHE_DIR}} - key: sccache-${{github.job}}-${{matrix.platform}}-${{matrix.configuration}}-${{ github.head_ref || github.ref_name }}-${{github.run_id}}-${{github.run_attempt}} - test: name: Test runs-on: ${{ matrix.runner }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ddb0b99..dfe7b12e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,10 +31,6 @@ set(ENV{ARCHFLAGS} "nope") ########################################## -include(cmake/sccache.cmake) - -########################################## - project(emulator LANGUAGES C CXX) enable_testing() diff --git a/cmake/sccache.cmake b/cmake/sccache.cmake deleted file mode 100644 index e0cdfdae..00000000 --- a/cmake/sccache.cmake +++ /dev/null @@ -1,16 +0,0 @@ -include_guard() - -if(CMAKE_GENERATOR STREQUAL "Ninja") - find_program(SCCACHE sccache) - - if (SCCACHE) - file(TO_CMAKE_PATH "${SCCACHE}" SCCACHE) - set(CMAKE_C_COMPILER_LAUNCHER ${SCCACHE}) - set(CMAKE_CXX_COMPILER_LAUNCHER ${SCCACHE}) - set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT Embedded) - - if(POLICY CMP0141) - cmake_policy(SET CMP0141 NEW) - endif() - endif() -endif() \ No newline at end of file diff --git a/src/backends/icicle-emulator/icicle-bridge/CMakeLists.txt b/src/backends/icicle-emulator/icicle-bridge/CMakeLists.txt index 8ce651a3..2ec000ca 100644 --- a/src/backends/icicle-emulator/icicle-bridge/CMakeLists.txt +++ b/src/backends/icicle-emulator/icicle-bridge/CMakeLists.txt @@ -37,18 +37,13 @@ endif() set(ICICLE_RUST_LIB ${ICICLE_ARTIFACT_DIR}/${ICICLE_RUST_LIBNAME}) -set(SCCACHE_ENV "MOMO_DUMMY_ENV=1") -if (SCCACHE) - set(SCCACHE_ENV "RUSTC_WRAPPER=${SCCACHE}") -endif() - ExternalProject_Add( icicle-rust-project PREFIX ${CMAKE_CURRENT_BINARY_DIR} SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR} BINARY_DIR ${CMAKE_CURRENT_LIST_DIR} CONFIGURE_COMMAND "" - BUILD_COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${ICICLE_BUILD_DIR}" "${SCCACHE_ENV}" -- cargo build ${CARGO_OPTIONS} --lib --profile $,dev,release> + BUILD_COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${ICICLE_BUILD_DIR}" -- cargo build ${CARGO_OPTIONS} --lib --profile $,dev,release> INSTALL_COMMAND "" USES_TERMINAL_CONFIGURE 1 USES_TERMINAL_BUILD 1