macos works, conan cache doesnt, fuck linux

Author: AmyrAhmady

.github/workflows/build.yml

@@ -161,7 +161,7 @@ jobs:
         env:
           cache-name: cache-conan-modules
         with:
-          path: docker/conan/p
+          path: docker/conan2/p
           key: conan-linux-${{ matrix.arch }}-${{ matrix.ssl }}-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
 
       - name: Build
@@ -175,7 +175,7 @@ jobs:
         env:
           cache-name: cache-conan-modules
         with:
-          path: docker/conan/p
+          path: docker/conan2/p
           key: ${{ steps.conan-cache-restore.outputs.cache-primary-key }}
 
       - name: Create a build archive
@@ -262,7 +262,7 @@ jobs:
         env:
           cache-name: cache-conan-modules
         with:
-          path: docker/conan/p
+          path: docker/conan2/p
           key: conan-linux-${{ matrix.arch }}-${{ matrix.ssl }}-${{ hashFiles('CMakeLists.txt', 'lib/CMakeLists.txt', 'SDK/CMakeLists.txt', 'SDK/lib/cmake-conan/conan.cmake', 'SDK/lib/cmake-conan/conan-omp.cmake') }}
 
       - name: Run ARM build
@@ -280,12 +280,12 @@ jobs:
             export CC=/usr/bin/clang-11
             export CXX=/usr/bin/clang++-11
             export PATH=~/.local/bin:${PATH}
-            mkdir -p docker/conan/p
+            mkdir -p docker/conan2/p
             mkdir -p ~/.conan2
             mv docker/conan/p ~/.conan2
             cmake -S . -B build -G Ninja -DTARGET_BUILD_ARCH=${{ matrix.arch == 'arm32' && 'armv7' || 'armv8' }} -DCMAKE_BUILD_TYPE=${{ steps.vars.outputs.build_config }} -DSHARED_OPENSSL=${{ matrix.ssl == 'dynamic' }} -DSTATIC_STDCXX=true -DBUILD_SERVER=1 -DBUILD_ABI_CHECK_TOOL=0
             cmake --build build --config ${{ steps.vars.outputs.build_config }} --parallel $(nproc)
-            mv ~/.conan2/p docker/conan
+            mv ~/.conan2/p docker/conan2
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
@@ -401,7 +401,7 @@ jobs:
         shell: bash
         run: |
           version="${{ steps.vars.outputs.build_version }}"
-          artifact_name="open.mp-macos-arm-${{ matrix.ssl == 'dynamic' && '-dynssl' || '' }}-${version}"
+          artifact_name="open.mp-macos-arm${{ matrix.ssl == 'dynamic' && '-dynssl' || '' }}-${version}"
 
           echo "artifact_name=${artifact_name}" >> "$GITHUB_OUTPUT"
 

docker/abicheck.sh

@@ -33,24 +33,21 @@ docker build \
     abicheck_ubuntu-${ubuntu_version}/ \
 || exit 1
 
-folders=('build' 'conan')
+folders=('build' 'conan2')
 for folder in "${folders[@]}"; do
     if [[ ! -d "./${folder}" ]]; then
-        mkdir "./${folder}" || exit 1
+        mkdir ${folder}
     fi
-    sudo chown -R 1000:1000 "./${folder}" || exit 1
+    sudo chown -R 1000:1000 ${folder} || exit 1
 done
 
-mkdir -p "./conan/p" || exit 1
-sudo chown -R 1000:1000 "./conan" || exit 1
-
 docker run \
     --rm \
     -t \
     -w /code \
     -v $PWD/..:/code \
     -v $PWD/build:/code/build \
-    -v $PWD/conan/p:/home/user/.conan2/p \
+    -v $PWD/conan2/p:/home/user/.conan2 \
     -v $PWD/ref:/ref \
     -e CONFIG=${config} \
     -e NIGHTLY_REPO=${nightly_repo} \

docker/build.sh

@@ -33,21 +33,18 @@ docker build \
 folders=('build' 'conan')
 for folder in "${folders[@]}"; do
     if [[ ! -d "./${folder}" ]]; then
-        mkdir "./${folder}"
+        mkdir ${folder}
     fi
-    sudo chown -R 1000:1000 "./${folder}" || exit 1
+    sudo chown -R 1000:1000 ${folder} || exit 1
 done
 
-mkdir -p "./conan/p" || exit 1
-sudo chown -R 1000:1000 "./conan" || exit 1
-
 docker run \
     --rm \
     -t \
     -w /code \
     -v $PWD/..:/code \
     -v $PWD/build:/code/build \
-    -v $PWD/conan/p:/home/user/.conan2/p \
+    -v $PWD/conan:/home/user/.conan2 \
     -e CONFIG=${config} \
     -e TARGET_BUILD_ARCH=${target_build_arch} \
     -e BUILD_SHARED=${build_shared} \