Merge pull request #150 from MarkusRannare/correct-zip-slash

Fixed directory delimiter in zip-files
modio · Jun 3, 2021 · 7a893c8 · 7a893c8
2 parents 4b633fd + 08d648c
commit 7a893c8
Show file tree

Hide file tree

Showing 5 changed files with 442 additions and 311 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        action: ['run-tests', 'compile-examples']
+        action: ['compile-examples']
         name:
           # - Ubuntu 16.04 GCC
           # - Ubuntu 16.04 Clang
@@ -56,6 +56,7 @@ jobs:
             cmake-args: -DBUILD_SHARED_LIBS=OFF -Dgtest_force_shared_crt=on
             build-dir: build
             build-src-dir: ..
+            #executable-extension: .exe
 
           # - name: Windows 2019 GCC
           #   os: windows-2019
@@ -103,7 +104,7 @@ jobs:
         run: |
           mkdir ${{ matrix.build-dir || '.not-used' }}
           cd ${{ matrix.build-dir || '.' }}
-          cmake ${{ matrix.build-src-dir || '.' }} ${{ steps.should-test.TEST-FLAGS }} ${{ matrix.cmake-args }}
+          cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }}
         env:
           CC: ${{ matrix.compiler }}
           CXX: ${{ matrix.cpp-compiler }}
@@ -120,8 +121,8 @@ jobs:
         if: matrix.action == 'run-tests'
         run: |
           cd ${{ matrix.build-dir || '.' }}
-          ctest -C ${{ matrix.build-config || 'Release' }} --output-on-failure
-
+          ./Release/runUnitTests${{ matrix.executable-extension || '' }}
+        shell: bash
       - name: Compile C examples
         if: ( runner.os == 'Linux' || runner.os == 'macOS' ) && matrix.action == 'compile-examples'
         run: |
@@ -134,7 +135,6 @@ jobs:
           CFLAGS: ${{ matrix.cflags || env.CFLAGS }}
           CXXFLAGS: ${{ matrix.cxxflags || env.CXXFLAGS }}
           LDFLAGS: ${{ matrix.ldflags || env.LDFLAGS }}
-
       - name: Compile C++ examples
         if: ( runner.os == 'Linux' || runner.os == 'macOS' ) && matrix.action == 'compile-examples'
         run: |

diff --git a/include/wrappers/MinizipWrapper.h b/include/wrappers/MinizipWrapper.h
@@ -15,6 +15,8 @@ namespace modio
     void extract(std::string zip_path, std::string directory_path);
     void compressDirectory(std::string directory, std::string zip_path);
     void compressFiles(std::string root_directory, std::vector<std::string> filenames, std::string zip_path);
+    // Internal function used for testing only
+    std::vector<std::string> getZipFilenames(const std::string& zip_path);
   }
 }