diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml index 23bd1324a6..cf748cf09a 100644 --- a/.github/workflows/flatpak-build.yml +++ b/.github/workflows/flatpak-build.yml @@ -84,73 +84,6 @@ jobs: flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo flatpak install --user -y --noninteractive org.gnome.Sdk//48 flatpak install --user -y --noninteractive org.gnome.Platform//48 - - - name: Build static ccache if not cached - id: static-ccache - uses: actions/cache@v4 - with: - path: ${{ github.workspace }}/ccache-static/ccache - key: ${{ runner.os }}-static-ccache-v2 - - - name: Build static ccache - if: steps.static-ccache.outputs.cache-hit != 'true' - run: | - echo "Статический ccache не найден в кэше. Собираем последнюю стабильную версию..." - sudo dnf install -y --skip-unavailable \ - gcc-c++ cmake git make pkgconf-pkg-config \ - glibc-static libstdc++-static zlib-ng-compat-devel - echo "Установленные базовые пакеты для сборки:" - dnf list --installed | grep -E "(gcc|cmake|git|make|glibc|zlib)" || true - rm -rf ccache-source ccache-build - git clone https://github.com/ccache/ccache.git ccache-source - if [ $? -ne 0 ]; then - echo "::error::Ошибка клонирования репозитория ccache" - exit 1 - fi - cd ccache-source - LATEST_TAG=$(git describe --tags `git rev-list --tags --max-count=1`) - echo "Переключение на последнюю стабильную версию ccache: $LATEST_TAG" - git checkout $LATEST_TAG - mkdir build && cd build - echo "Запуск конфигурации CMake для последней версии ccache..." - cmake .. \ - -DCMAKE_BUILD_TYPE=Release \ - -DSTATIC_LINKING=ON \ - -DENABLE_TESTING=OFF \ - -DDEPS=BUNDLED \ - -DCMAKE_POSITION_INDEPENDENT_CODE=OFF - - if [ $? -ne 0 ]; then - echo "::error::Ошибка конфигурации CMake. Детали:" - cat CMakeFiles/CMakeError.log || echo "CMakeError.log не найден" - cat CMakeFiles/CMakeOutput.log || echo "CMakeOutput.log не найден" - exit 1 - fi - - echo "Начинаем компиляцию ccache..." - cmake --build . -j$(nproc) --verbose - if [ $? -ne 0 ]; then - echo "::error::Ошибка компиляции ccache" - exit 1 - fi - - echo "Проверка зависимостей собранного ccache:" - ldd ./ccache || echo "ccache собран статически" - file ./ccache - - echo "Тестирование ccache..." - ./ccache --version - if [ $? -ne 0 ]; then - echo "::error::Собранный ccache не работает" - exit 1 - fi - - mkdir -p ${{ github.workspace }}/ccache-static - cp ./ccache ${{ github.workspace }}/ccache-static/ccache - chmod +x ${{ github.workspace }}/ccache-static/ccache - echo "Полностью статический ccache успешно собран и протестирован." - cd ${{ github.workspace }} - rm -rf ccache-source - name: Cache TDesktop Dependencies id: cache-tdesktop-deps @@ -159,21 +92,9 @@ jobs: path: Telegram/ThirdParty key: ${{ runner.os }}-tdeps-${{ hashFiles('Telegram/build/prepare/dependencies.txt') }} - - name: Cache ccache directory - uses: actions/cache@v4 - with: - path: ${{ github.workspace }}/.ccache - key: ${{ runner.os }}-ccache-${{ github.sha }} - restore-keys: | - ${{ runner.os }}-ccache- - - name: Prepare libraries run: ./Telegram/build/prepare/linux.sh - - name: Zero ccache statistics before build - run: | - ${{ github.workspace }}/ccache-static/ccache -z --config-path=${{ github.workspace }}/.ccache/ccache.conf - - name: Build AyuGram binary env: TDESKTOP_API_ID: ${{ secrets.TDESKTOP_API_ID }} @@ -184,20 +105,12 @@ jobs: --cpus="3" \ -u $(id -u):$(id -g) \ -v "$PWD:/usr/src/tdesktop" \ - -v "${{ github.workspace }}/ccache-static/ccache:/usr/local/bin/ccache:ro" \ - -v "${{ github.workspace }}/.ccache:/home/user/.ccache" \ - -e "CCACHE_DIR=/home/user/.ccache" \ ghcr.io/telegramdesktop/tdesktop/centos_env:latest \ /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \ -D CMAKE_C_COMPILER_LAUNCHER=/usr/local/bin/ccache \ -D CMAKE_CXX_COMPILER_LAUNCHER=/usr/local/bin/ccache \ -D TDESKTOP_API_ID=${TDESKTOP_API_ID} \ -D TDESKTOP_API_HASH=${TDESKTOP_API_HASH} - - - name: Show ccache statistics and cache size - run: | - ${{ github.workspace }}/ccache-static/ccache -s --config-path=${{ github.workspace }}/.ccache/ccache.conf - du -sh ${{ github.workspace }}/.ccache - name: Prepare Flatpak build directory run: |