diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 1d7014a..c96022e 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -6,13 +6,6 @@ on: - '**' workflow_dispatch: -env: - CCACHE_DIR: /ccache - CCACHE_MAXSIZE: 10G - CCACHE_BASEDIR: /root/.conan2 - CCACHE_NOHASHDIR: "true" - CCACHE_COMPILERCHECK: "%compiler% -dumpversion" - jobs: conan-packages-tier1: runs-on: ubuntu-latest @@ -59,9 +52,6 @@ jobs: with: submodules: recursive - - name: Zero ccache stats - run: ccache --zero-stats - - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -72,16 +62,13 @@ jobs: --user=bigfootdev \ --channel=${{ env.BRANCH_NAME }} \ -pr:b=./ConanProfiles/clang -pr:h=./ConanProfiles/clang \ - --build=missing --remote=bigfootpackages + --build=* --remote=bigfootpackages CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \ CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \ conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ --only-recipe --remote=bigfootpackages - - name: Show ccache stats after - run: ccache --show-stats - conan-packages-tier2: needs: conan-packages-tier1 runs-on: ubuntu-latest @@ -114,9 +101,6 @@ jobs: with: submodules: recursive - - name: Zero ccache stats - run: ccache --zero-stats - - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -127,16 +111,13 @@ jobs: --user=bigfootdev \ --channel=${{ env.BRANCH_NAME }} \ -pr:b=./ConanProfiles/clang -pr:h=./ConanProfiles/clang \ - --build=missing --remote=bigfootpackages + --build=* --remote=bigfootpackages CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \ CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \ conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ --only-recipe --remote=bigfootpackages - - name: Show ccache stats after - run: ccache --show-stats - conan-packages-tier3: needs: conan-packages-tier2 runs-on: ubuntu-latest @@ -165,9 +146,6 @@ jobs: with: submodules: recursive - - name: Zero ccache stats - run: ccache --zero-stats - - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -178,16 +156,13 @@ jobs: --user=bigfootdev \ --channel=${{ env.BRANCH_NAME }} \ -pr:b=./ConanProfiles/clang -pr:h=./ConanProfiles/clang \ - --build=missing --remote=bigfootpackages + --build=* --remote=bigfootpackages CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \ CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \ conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ --only-recipe --remote=bigfootpackages - - name: Show ccache stats after - run: ccache --show-stats - conan-packages-tier4: needs: conan-packages-tier3 runs-on: ubuntu-latest @@ -215,9 +190,6 @@ jobs: with: submodules: recursive - - name: Zero ccache stats - run: ccache --zero-stats - - name: Run Conan packaging run: | echo "Building ${{ matrix.package.name }}@${{ matrix.package.version }}" @@ -228,12 +200,9 @@ jobs: --user=bigfootdev \ --channel=${{ env.BRANCH_NAME }} \ -pr:b=./ConanProfiles/clang -pr:h=./ConanProfiles/clang \ - --build=missing --remote=bigfootpackages + --build=* --remote=bigfootpackages CONAN_LOGIN_USERNAME=${ARTIFACTORY_USER} \ CONAN_PASSWORD=${ARTIFACTORY_PASSWORD} \ conan upload ${{ matrix.package.name }}/${{ matrix.package.version }}@bigfootdev/${{ env.BRANCH_NAME }} \ - --only-recipe --remote=bigfootpackages - - - name: Show ccache stats after - run: ccache --show-stats \ No newline at end of file + --only-recipe --remote=bigfootpackages \ No newline at end of file diff --git a/ConanProfiles/Toolchains/ccache.cmake b/ConanProfiles/Toolchains/ccache.cmake deleted file mode 100644 index 5fce6ee..0000000 --- a/ConanProfiles/Toolchains/ccache.cmake +++ /dev/null @@ -1,30 +0,0 @@ -include_guard() - -# Find ccache executable -find_program(CCACHE_PROGRAM NAMES ccache) - -if(CCACHE_PROGRAM) - message(STATUS "ccache found: ${CCACHE_PROGRAM}, enabling via CMake launcher and environment.") - if (CMAKE_GENERATOR MATCHES "Visual Studio") - # Copy original ccache.exe and rename to cl.exe, this way intermediate cmd file is not needed - file(COPY_FILE ${CCACHE_PROGRAM} ${CMAKE_BINARY_DIR}/cl.exe ONLY_IF_DIFFERENT) - - # Set Visual Studio global variables: - # - Use above cl.exe (ccache.exe) as a compiler - # - Enable parallel compilation - list(APPEND CMAKE_VS_GLOBALS - "CLToolExe=cl.exe" - "CLToolPath=${CMAKE_BINARY_DIR}" - "UseMultiToolTask=true" - "UseStructuredOutput=false" - ) - elseif(CMAKE_GENERATOR MATCHES "Ninja" OR CMAKE_GENERATOR MATCHES "Unix Makefiles") - message(STATUS "Using ccache as compiler launcher for Ninja or Makefiles.") - set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "CXX compiler cache used" FORCE) - set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE_PROGRAM} CACHE FILEPATH "C compiler cache used" FORCE) - else() - message(WARNING "Unsupported generator for ccache integration: ${CMAKE_GENERATOR}. ccache will not be used.") - endif() -else() - message(WARNING "ccache not found. Not enabling ccache integration.") -endif() \ No newline at end of file diff --git a/ConanProfiles/clang b/ConanProfiles/clang index fb843d8..8080a87 100644 --- a/ConanProfiles/clang +++ b/ConanProfiles/clang @@ -10,8 +10,6 @@ compiler.runtime=static build_type=Release [conf] -tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake - tools.system.package_manager:mode=install tools.system.package_manager:sudo=True diff --git a/ConanProfiles/msvc b/ConanProfiles/msvc index 049a6b8..c026c58 100644 --- a/ConanProfiles/msvc +++ b/ConanProfiles/msvc @@ -9,8 +9,6 @@ compiler.runtime=static build_type=Release [conf] -tools.cmake.cmaketoolchain:user_toolchain+={{profile_dir}}/Toolchains/ccache.cmake - tools.build:cflags=["/Zc:preprocessor", "/Zc:__STDC__", "/D_CRT_DECLARE_NONSTDC_NAMES=1"] tools.build:cxxflags=["/Zc:preprocessor", "/permissive-", "/Zc:__cplusplus", "/Zc:enumTypes", "/Zc:templateScope"]