chore: Merge branch 'release/release-3.7.8'

# Conflicts:
#	test/libsyncengine/jobs/testsyncjobmanager.cpp

Author: ClementKunz

.github/actions/build_linux_arm/action.yml

@@ -11,7 +11,7 @@ runs:
       - name: Run the build script
         id: build
         run: |
-          /usr/bin/env bash ${{ github.workspace }}/infomaniak-build-tools/linux/build-release-arm64-via-podman.sh --src-dir ${{ github.workspace }}
+          /usr/bin/env bash ${{ github.workspace }}/infomaniak-build-tools/linux/build-release.sh -d ${{ github.workspace }}
         shell: bash
 
       - name: Upload app AppImage

.github/actions/build_macos/action.yml

@@ -78,9 +78,9 @@ runs:
           cp /usr/local/lib/libzip.5.dylib ./dependencies/
           cp /usr/local/lib/libzstd.1.dylib ./dependencies/
           cp ${{ github.workspace }}/build-macos/client/bin/crashpad_handler ./dependencies/
-          # kDrivecommonserver_vfs_mac lib is not cached and therefore is uploaded as a separate artifact
+          # kDrive_vfs_mac lib is not cached and therefore is uploaded as a separate artifact
           find "${{ github.workspace }}/build-macos/client/bin" -name "*.dylib" \
-            -not -name "kDrivecommonserver_vfs_mac.dylib" \
+            -not -name "kDrive_vfs_mac.dylib" \
             -exec cp {} ./dependencies/ \;
         shell: bash
         if: ${{ steps.build.outcome == 'success' && inputs.release_build == 'false' }} # Only copy dependencies for debug builds, release builds will have them in the app bundle
@@ -116,7 +116,7 @@ runs:
                 cp ${{ github.workspace }}/build-macos/client/bin/*.lst ./uncached_dependencies/
           fi
 
-          cp ${{ github.workspace }}/build-macos/client/bin/kDrivecommonserver_vfs_mac.dylib ./uncached_dependencies/
+          cp ${{ github.workspace }}/build-macos/client/bin/kDrive_vfs_mac.dylib ./uncached_dependencies/
           
         shell: bash
         if: ${{ steps.build.outcome == 'success' }}
@@ -269,6 +269,6 @@ runs:
         if: ${{ steps.build.outcome == 'success' && inputs.release_build == 'true' }}
 
       - name: Clean-up generated code
-        run : rm -rf build-macos
+        run : rm -rf build-macos/
         shell: bash
 

.github/actions/build_windows/action.yml

@@ -73,10 +73,10 @@ runs:
       - name: Fetch dependencies
         run: |
           mkdir dependencies
-          # kDrivecommonserver_vfs_win lib is not cached and therefore is uploaded as a separate artifact
+          # kDrive_vfs_win lib is not cached and therefore is uploaded as a separate artifact
           Get-ChildItem -Path ${{ github.workspace }}/build-windows/install/bin/ -Filter "*.dll" |
               Where-Object {
-                      $_.Name -ne "kDrivecommonserver_vfs_win.dll" -and
+                      $_.Name -ne "kDrive_vfs_win.dll" -and
                       $_.Name -ne "KDContextMenu.dll" -and
                       $_.Name -ne "KDOverlays.dll" -and
                       $_.Name -ne "Vfs.dll"
@@ -126,7 +126,7 @@ runs:
           mkdir uncached_dependencies
           $uncached = @(
               "sync-exclude.lst",
-              "kDrivecommonserver_vfs_win.dll",
+              "kDrive_vfs_win.dll",
               "KDContextMenu.dll",
               "KDOverlays.dll",
               "Vfs.dll"

.github/actions/get_version/action.yml

@@ -7,25 +7,14 @@ outputs:
     value: ${{ steps.get-version-step.outputs.kDrive_version }}
 
 runs:
-    using: "composite"
-    steps:
-      - name: Read VERSION.cmake from repo
-        id: get-version-step
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const file = await github.rest.repos.getContent({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              path: 'VERSION.cmake',
-              ref: context.sha
-            });
-            const content = Buffer.from(file.data.content, file.data.encoding).toString();
-            const major = content.match(/KDRIVE_VERSION_MAJOR\s+(\d+)/)?.[1];
-            const minor = content.match(/KDRIVE_VERSION_MINOR\s+(\d+)/)?.[1];
-            const patch = content.match(/KDRIVE_VERSION_PATCH\s+(\d+)/)?.[1];
-            const date = new Date().toISOString().slice(0, 10).replace(/-/g, '');
-            
-            const full_version = `${major}.${minor}.${patch}.${date}`;
-            core.setOutput("kDrive_version", `${full_version}`);
-            core.info(`kDrive version is ${full_version}`);
+  using: "composite"
+  steps:
+    - name: Get version from version.json
+      id: get-version-step
+      shell: bash
+      run: |
+        source "${{ github.workspace }}/infomaniak-build-tools/version-helpers.sh"
+        VERSION=$(GetVersionFromJson "${{ github.workspace }}" true)
+
+        echo "Detected version: $VERSION"
+        echo "kDrive_version=$VERSION" >> "$GITHUB_OUTPUT"

.github/workflows/build-and-run-extended-tests.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Build kDrive desktop
         run: |
           call "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvars64.bat"
-          powershell ./infomaniak-build-tools/windows/build-drive.ps1 -ci -coverage
+          powershell ./infomaniak-build-tools/windows/build-drive.ps1 -ci -coverage -unitTests
         shell: cmd
 
       - name: Execute tests

.github/workflows/kdrive-desktop-release.yml

@@ -59,11 +59,9 @@ jobs:
 
       - name: Check release notes
         run: |
-          VERSION_NUMBER="${{ steps.get-version.outputs.kDrive_version }}"  # Example: 3.9.20.20250820
-          version_size=${#VERSION_NUMBER}
-          end_position=$((size - 9))
-          VERSION_NUMBER=${VERSION_NUMBER:0:$end_position}  # Removes the date, e.g., 20250820
-
+          VERSION_NUMBER="${{ steps.get-version.outputs.kDrive_version }}"  # Example: 3.9.20.23
+          VERSION_NUMBER="${VERSION_NUMBER%.*}"  # Remove build number for release notes check
+         
           BASE_NAME="kDrive-${VERSION_NUMBER}"
           BASE_PATH="./release_notes/${BASE_NAME}"
           OS=( "win" "linux" "macos" )

.github/workflows/package.yml

@@ -193,3 +193,5 @@ cmake-build-debug*
 # Python virtual environment folder, used by the installation of conan.
 .venv/
 /infomaniak-build-tools/windows/ksigntool/.vs/ksigntool
+**/BundleArtifactss
+/*build*

.gitignore

@@ -157,7 +157,7 @@ if(APPLE)
 endif(APPLE)
 
 if(APPLE)
-    set(SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit")
+    set(TEAM_IDENTIFIER_PREFIX "" CACHE STRING "Team identifier prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit")
 endif()
 
 if(BUILD_CLIENT)
@@ -247,6 +247,9 @@ if(BUILD_KDRIVE_OSX_BUNDLE)
     # Default Lite Sync app exclude list
     install(FILES litesync-exclude.lst DESTINATION ${KDRIVE_OSX_BUNDLE}/Contents/Resources/)
 
+    # Assets
+    install(FILES ${KDRIVE_THEME_DIR}/Assets.car DESTINATION ${KDRIVE_OSX_BUNDLE}/Contents/Resources/)
+
     # Crashpad_handler
     find_program(CRASHPAD_HANDLER_PROGRAM NAMES crashpad_handler NO_CACHE)
     message(STATUS "crashpad_handler found in ${CRASHPAD_HANDLER_PROGRAM}")

CMakeLists.txt

@@ -1,11 +1,6 @@
 set(KDRIVE_THEME_DIR "" CACHE STRING "Define directory containing a custom theme")
 include("${KDRIVE_THEME_DIR}/kDrive.cmake")
 
-# Default suffix if the theme doesn't define one
-if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX)
-    set(APPLICATION_VIRTUALFILE_SUFFIX "${APPLICATION_SHORTNAME}_virtual" CACHE STRING "Virtual file suffix (not including the .)")
-endif()
-
 # Default dbus name and path
 if(NOT DEFINED APPLICATION_CLOUDPROVIDERS_DBUS_NAME)
     set(APPLICATION_CLOUDPROVIDERS_DBUS_NAME ${APPLICATION_REV_DOMAIN})