From 69550d80ba665579146d2d356dc99b7cff4edf34 Mon Sep 17 00:00:00 2001
From: 0FL01 <andrej89536995626@gmail.com>
Date: Wed, 23 Jul 2025 12:10:04 +0300
Subject: [PATCH] fix conflict

---
 .github/workflows/flatpak-build.yml | 34 +++++++++++++----------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/flatpak-build.yml b/.github/workflows/flatpak-build.yml
index 755681003b..39fc779949 100644
--- a/.github/workflows/flatpak-build.yml
+++ b/.github/workflows/flatpak-build.yml
@@ -111,32 +111,28 @@ jobs:
         env:
           TDESKTOP_API_ID: ${{ secrets.TDESKTOP_API_ID }}
           TDESKTOP_API_HASH: ${{ secrets.TDESKTOP_API_HASH }}
-          CCACHE_DIR: ${{ runner.tool_cache }}/ccache
-          CCACHE_BASEDIR: ${{ github.workspace }}
-          CCACHE_MAXSIZE: 5G
-          CCACHE_LOGFILE: /ccache/ccache.log   # optional for debug
         run: |
           mkdir -p .ccache
           sudo chmod -R 777 .ccache
+
           docker run --rm \
             --cpus="3" \
+            -u root \
             -v "$PWD:/usr/src/tdesktop" \
-            -v "${CCACHE_DIR}:/ccache" \
+            -v "$PWD/.ccache:/ccache" \
             ghcr.io/telegramdesktop/tdesktop/centos_env:latest \
-            /bin/bash -c "\
-              dnf install -y ccache && \
-              export PATH=\"/usr/lib64/ccache:\$PATH\" && \ 
-              export CCACHE_DIR=/ccache \
-              export CCACHE_BASEDIR=/usr/src/tdesktop \
-              export CCACHE_COMPRESS=1 \
-              /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
-                -D TDESKTOP_API_ID=${TDESKTOP_API_ID} \
-                -D TDESKTOP_API_HASH=${TDESKTOP_API_HASH} \
-                -D USE_CCACHE=ON \
-                -D CMAKE_C_COMPILER_LAUNCHER=ccache \
-                -D CMAKE_CXX_COMPILER_LAUNCHER=ccache && \
-              ccache -s && \
-              echo 'ccache log: ' && tail -20 /ccache/ccache.log || true"
+            /bin/bash -c "dnf install -y ccache && \
+                          export PATH=/usr/lib64/ccache:\$PATH && \
+                          export CCACHE_DIR=/ccache && \
+                          export CCACHE_BASEDIR=/usr/src/tdesktop && \
+                          export CCACHE_COMPRESS=1 && \
+                          /usr/src/tdesktop/Telegram/build/docker/centos_env/build.sh \
+                            -D TDESKTOP_API_ID=${TDESKTOP_API_ID} \
+                            -D TDESKTOP_API_HASH=${TDESKTOP_API_HASH} \
+                            -D USE_CCACHE=ON \
+                            -D CMAKE_C_COMPILER_LAUNCHER=ccache \
+                            -D CMAKE_CXX_COMPILER_LAUNCHER=ccache && \
+                          ccache -s"
 
       - name: Prepare Flatpak build directory
         run: |