53 update project structure

.github/workflows/linux-workflow.yml

@@ -1,7 +1,6 @@
 name: libtusclient CI Linux
 
 on:
-  push:
   pull_request:
   release:
     types: [created]
@@ -63,30 +62,41 @@ jobs:
           key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
             vcpkg-${{ runner.os }}
+
+      - name: Cache build folder
+        uses: actions/cache@v4
+        with:
+          path: |
+            build
+          key: ${{ runner.os }}-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-${{ github.ref_name }}-${{ hashFiles('CMakeLists.txt', '**/CMakeLists.txt', 'vcpkg.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-${{ github.ref_name }}-
+            ${{ runner.os }}-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-
+
+
       - name: Configure CMake
         run: |
           cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=${{ matrix.vcpkg_root }}/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=${{ steps.strings.outputs.build-type }}
-
-
+
       - name: Build Library
-        run: cmake --build build --target libtusclient --config ${{ steps.strings.outputs.build-type }}
+        run: cmake --build build --target tusclient --config ${{ steps.strings.outputs.build-type }}
 
       - name: Build Tests
-        run: cmake --build build --target libtusclient_test --config ${{ steps.strings.outputs.build-type }}
+        run: cmake --build build --target tusclient_test --config ${{ steps.strings.outputs.build-type }}
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-linux
-          path: build/${{ steps.strings.outputs.test-folder }}/lib/liblibtusclient.so
+          path: build/build/tusclient/lib/libtusclient.so
 
       - name: Upload artifacts for test
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-for-test
           path: |
-            build/${{ steps.strings.outputs.test-folder }}/lib/liblibtusclient.so
-            build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test
+            build/build/tusclient/lib/libtusclient.so
+            build/build/tusclient_test/bin/tusclient_test
 
   test-linux:
     needs: build-linux
@@ -116,7 +126,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: build-artifacts-for-test
-          path: build/${{ steps.strings.outputs.test-folder }}
+          path: build/build
 
       - name: Run Mockoon CLI
         uses: mockoon/cli-action@v2
@@ -132,9 +142,9 @@ jobs:
       - name: Test Project
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: |
-          chmod +x build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test
-          export LD_LIBRARY_PATH=build/${{ steps.strings.outputs.test-folder }}:$LD_LIBRARY_PATH
-          build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test --gtest_output=xml:build/${{ steps.strings.outputs.test-folder }}/test-results.xml
+          chmod +x build/build/tusclient_test/bin/tusclient_test
+          export LD_LIBRARY_PATH=build/build/tusclient/lib:$LD_LIBRARY_PATH
+          build/build/tusclient_test/bin/tusclient_test --gtest_output=xml:build/${{ steps.strings.outputs.test-folder }}/test-results.xml
 
       - name: Upload test results
         uses: actions/upload-artifact@v4

.github/workflows/mac-workflow.yml

@@ -1,7 +1,6 @@
 name: libtusclient CI MacOS
 
 on:
-  push:
   pull_request:
   release:
     types: [created]
@@ -62,29 +61,38 @@ jobs:
           key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
             vcpkg-${{ runner.os }}
-
+      - name: Cache build folder
+        uses: actions/cache@v4
+        with:
+          path: |
+            build
+          key: macos-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-${{ github.ref_name }}-${{ hashFiles('CMakeLists.txt', '**/CMakeLists.txt', 'vcpkg.json') }}
+          restore-keys: |
+            macos-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-${{ github.ref_name }}-
+            macos-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-
+
       - name: Configure CMake
         run: |
           cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=${{ matrix.vcpkg_root }}/scripts/buildsystems/vcpkg.cmake -DCMAKE_BUILD_TYPE=${{ steps.strings.outputs.build-type }}
       - name: Build Library
-        run: cmake --build build --target libtusclient --config ${{ steps.strings.outputs.build-type }}
+        run: cmake --build build --target tusclient --config ${{ steps.strings.outputs.build-type }}
 
       - name: Build Tests
-        run: cmake --build build --target libtusclient_test --config ${{ steps.strings.outputs.build-type }}
+        run: cmake --build build --target tusclient_test --config ${{ steps.strings.outputs.build-type }}
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-mac
-          path: build/${{ steps.strings.outputs.test-folder }}/lib/liblibtusclient.dylib
+          path: build/build/tusclient/lib/libtusclient.dylib
 
       - name: Upload artifacts for test
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-for-test-mac
           path: |
-            build/${{ steps.strings.outputs.test-folder }}/lib/liblibtusclient.dylib
-            build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test
+            build/build/tusclient/lib/libtusclient.dylib
+            build/build/tusclient_test/bin/tusclient_test
 
   test-mac:
     needs: build-mac
@@ -114,7 +122,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: build-artifacts-for-test-mac
-          path: build/${{ steps.strings.outputs.test-folder }}
+          path: build/build/
 
       - name: Run Mockoon CLI
         uses: mockoon/cli-action@v2
@@ -134,9 +142,9 @@ jobs:
 
       - name: Test Project
         run: |
-          chmod +x build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test
-          export DYLD_LIBRARY_PATH=build/${{ steps.strings.outputs.test-folder }}:$DYLD_LIBRARY_PATH
-          build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test --gtest_output=xml:build/${{ steps.strings.outputs.test-folder }}/test-results.xml
+          chmod +x build/build/tusclient_test/bin/tusclient_test
+          export DYLD_LIBRARY_PATH=build/build/tusclient/lib:$DYLD_LIBRARY_PATH
+          build/build/tusclient_test/bin/tusclient_test --gtest_output=xml:build/${{ steps.strings.outputs.test-folder }}/test-results.xml
 
       - name: Upload test results
         uses: actions/upload-artifact@v4

.github/workflows/windows-workflow.yml

@@ -1,7 +1,6 @@
 name: libtusclient CI Windows
 
 on:
-  push:
   pull_request:
   release:
     types: [created]
@@ -36,8 +35,10 @@ jobs:
           fi
       - name: Setup vcpkg
         run: |
-            git clone https://github.com/microsoft/vcpkg.git
-            & "${{ matrix.vcpkg_root }}\bootstrap-vcpkg.bat"
+          if (-not(Test-Path -Path "${{ matrix.vcpkg_root }}")) {
+          git clone https://github.com/microsoft/vcpkg.git "${{ matrix.vcpkg_root }}"
+          & "${{ matrix.vcpkg_root }}/bootstrap-vcpkg.bat"
+          }
       - name: Export GitHub Actions cache environment variables
         uses: actions/github-script@v7
         with:
@@ -60,29 +61,44 @@ jobs:
           key: vcpkg-${{ runner.os }}-${{ hashFiles('vcpkg.json') }}
           restore-keys: |
             vcpkg-${{ runner.os }}
+      - name: Cache build folder
+        uses: actions/cache@v4
+        with:
+          path: |
+            build
+          key: windows-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-${{ github.ref_name }}-${{ hashFiles('CMakeLists.txt', '**\CMakeLists.txt', 'vcpkg.json') }}
+          restore-keys: |
+            windows-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-${{ github.ref_name }}-
+            windows-build-${{ matrix.c_compiler }}-${{ steps.strings.outputs.build-type }}-
 
       - name: Configure CMake
         run: |
           cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE="vcpkg\scripts\buildsystems\vcpkg.cmake" -DCMAKE_BUILD_TYPE=${{ steps.strings.outputs.build-type }}
       - name: Build Library
-        run: cmake --build build --target libtusclient --config ${{ steps.strings.outputs.build-type }}
+        run: cmake --build build --target tusclient --config ${{ steps.strings.outputs.build-type }}
+
+      - name: Copy library folder content to test build folder
+        run: |
+            if (!(Test-Path -Path "build/build/tusclient_test")) {
+                New-Item -ItemType Directory -Path "build/build/tusclient_test"
+            }
+            Copy-Item -Path "build/build/tusclient/bin/*" -Destination "build/build/tusclient_test/bin" -Recurse -Force
 
       - name: Build Tests
-        run: cmake --build build --target libtusclient_test --config ${{ steps.strings.outputs.build-type }}
+        run: cmake --build build --target tusclient_test --config ${{ steps.strings.outputs.build-type }}
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-windows
-          path: build/${{ steps.strings.outputs.test-folder }}/bin/*.dll
+          path: build/build/tusclient/bin/
 
       - name: Upload artifacts for test
         uses: actions/upload-artifact@v4
         with:
           name: build-artifacts-for-test
           path: |
-            build/${{ steps.strings.outputs.test-folder }}/bin/*.dll
-            build/${{ steps.strings.outputs.test-folder }}/bin/libtusclient_test.exe
+            build/build/tusclient_test/bin/
 
   test-windows:
     needs: build-windows
@@ -94,7 +110,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: build-artifacts-for-test
-          path: build/
+          path: build/build
 
       - name: Run Mockoon CLI
         uses: mockoon/cli-action@v2
@@ -114,4 +130,4 @@ jobs:
 
       - name: Run Tests
         run: |
-          build/${{ steps.strings.outputs.test-folder }}/libtusclient_test.exe --gtest_output=xml:test-results.xml
+          .\build\build\Debug\tusclient_test.exe --gtest_output=xml:test-results.xml