Upload symbols for Conan-built libraries

.github/workflows/cmake_build.yml

@@ -74,9 +74,9 @@ jobs:
         cache-name: cache-conan-modules
       with:
         path: ${{ env.CONAN_USER_HOME }}
-        key: host-${{ matrix.config.name }}-${{ hashFiles('cmake-proxies/CMakeLists.txt') }}
+        key: host-2-${{ matrix.config.name }}-${{ hashFiles('cmake-proxies/CMakeLists.txt') }}
         restore-keys: |
-          host-${{ matrix.config.name }}-
+          host-2-${{ matrix.config.name }}-
 
     - name: Configure
       env:

scripts/ci/build.sh

@@ -22,17 +22,21 @@ fi
 cmake --build build -j "${cpus}" --config "${AUDACITY_BUILD_TYPE}"
 
 BIN_OUTPUT_DIR=build/bin/${AUDACITY_BUILD_TYPE}
+SHARED_OUTPUT_DIR=build/shared/${AUDACITY_BUILD_TYPE}
 SYMBOLS_OUTPUT_DIR=debug
 
 mkdir ${SYMBOLS_OUTPUT_DIR}
 
 if [[ "${OSTYPE}" == msys* ]]; then # Windows
     # copy PDBs to debug folder...
-    find ${BIN_OUTPUT_DIR} -name '*.pdb' | xargs -I % cp % ${SYMBOLS_OUTPUT_DIR}
+    find ${BIN_OUTPUT_DIR} -name '*.pdb' | xargs -I % cp -v % ${SYMBOLS_OUTPUT_DIR}
+    find ${SHARED_OUTPUT_DIR} -name '*.pdb' | xargs -I % cp -v % ${SYMBOLS_OUTPUT_DIR}
+    find $(cygpath ${CONAN_USER_HOME}) -name '*.pdb' | xargs -I % cp -v % ${SYMBOLS_OUTPUT_DIR}
     # and remove debug symbol files from the file tree before archieving
     find ${BIN_OUTPUT_DIR} -name '*.iobj' -o -name '*.ipdb' -o -name '*.pdb' -o -name '*.ilk' | xargs rm -f
 elif [[ "${OSTYPE}" == darwin* ]]; then # macOS
     find ${BIN_OUTPUT_DIR} -name '*.dSYM' | xargs -J % mv % ${SYMBOLS_OUTPUT_DIR}
+    find ${CONAN_USER_HOME} -name '*.dSYM' | xargs -J % cp -R % ${SYMBOLS_OUTPUT_DIR}
 else # Linux & others
     chmod +x scripts/ci/linux/split_debug_symbols.sh
     find ${BIN_OUTPUT_DIR} -type f -executable -o -name '*.so' | xargs -n 1 scripts/ci/linux/split_debug_symbols.sh

scripts/ci/configure.sh

@@ -64,5 +64,25 @@ fi
 # Configure Audacity
 cmake "${cmake_args[@]}"
 
+if [[ "${OSTYPE}" == msys* ]]; then # Windows
+    # On Windows, preserve PDB files before clearing the build cache
+    
+    conanUnixPath=$(cygpath ${CONAN_USER_HOME})
+    pdbOutputPath="${conanUnixPath}/pdbs"
+
+    ls -la ${conanUnixPath}
+
+    mkdir -p "${pdbOutputPath}"
+    find "${conanUnixPath}/.conan" -name '*.pdb' '!' -name "vc14?.pdb" -type f | xargs -I % cp -v % ${pdbOutputPath}
+elif [[ "${OSTYPE}" == darwin* ]]; then # macOS
+    # On macOS - find all the .dylib files and generate dSYMs from them 
+    # in the same folder.
+    # dsymutil requires *.o files, so we need to generate files before clearing
+    # the build directories.
+
+    chmod +x scripts/ci/macos/generate_dsym.sh
+    scripts/ci/macos/generate_dsym.sh
+fi
+
 # Remove build directories and sources to reduce the cache size.
 conan remove "*" --src --builds --force

scripts/ci/macos/generate_dsym.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -xe
+
+function extractDSym()
+{
+    local lib=$1
+    local libfile=$(basename $lib)
+    local libname="${libfile%.*}"
+    local targetdir=$(dirname $lib)
+
+    if [[ ! -L "$lib" && "$lib" != "{}" && $lib != *"dSYM"* ]]; then
+        echo "Extracting dSYMs from ${libfile} to ${libname}.dSYM"
+        dsymutil "$lib" -o "${targetdir}/${libname}.dSYM"
+    fi
+}
+
+export -f extractDSym
+
+find $CONAN_USER_HOME -name "*.dylib" | xargs -I {} bash -c 'extractDSym "{}"'