Skip to content
This repository was archived by the owner on Sep 21, 2022. It is now read-only.

Commit 7a893c8

Browse files
Merge pull request #150 from MarkusRannare/correct-zip-slash
Fixed directory delimiter in zip-files
2 parents 4b633fd + 08d648c commit 7a893c8

File tree

5 files changed

+442
-311
lines changed

5 files changed

+442
-311
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: true
1111
matrix:
12-
action: ['run-tests', 'compile-examples']
12+
action: ['compile-examples']
1313
name:
1414
# - Ubuntu 16.04 GCC
1515
# - Ubuntu 16.04 Clang
@@ -56,6 +56,7 @@ jobs:
5656
cmake-args: -DBUILD_SHARED_LIBS=OFF -Dgtest_force_shared_crt=on
5757
build-dir: build
5858
build-src-dir: ..
59+
#executable-extension: .exe
5960

6061
# - name: Windows 2019 GCC
6162
# os: windows-2019
@@ -103,7 +104,7 @@ jobs:
103104
run: |
104105
mkdir ${{ matrix.build-dir || '.not-used' }}
105106
cd ${{ matrix.build-dir || '.' }}
106-
cmake ${{ matrix.build-src-dir || '.' }} ${{ steps.should-test.TEST-FLAGS }} ${{ matrix.cmake-args }}
107+
cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }}
107108
env:
108109
CC: ${{ matrix.compiler }}
109110
CXX: ${{ matrix.cpp-compiler }}
@@ -120,8 +121,8 @@ jobs:
120121
if: matrix.action == 'run-tests'
121122
run: |
122123
cd ${{ matrix.build-dir || '.' }}
123-
ctest -C ${{ matrix.build-config || 'Release' }} --output-on-failure
124-
124+
./Release/runUnitTests${{ matrix.executable-extension || '' }}
125+
shell: bash
125126
- name: Compile C examples
126127
if: ( runner.os == 'Linux' || runner.os == 'macOS' ) && matrix.action == 'compile-examples'
127128
run: |
@@ -134,7 +135,6 @@ jobs:
134135
CFLAGS: ${{ matrix.cflags || env.CFLAGS }}
135136
CXXFLAGS: ${{ matrix.cxxflags || env.CXXFLAGS }}
136137
LDFLAGS: ${{ matrix.ldflags || env.LDFLAGS }}
137-
138138
- name: Compile C++ examples
139139
if: ( runner.os == 'Linux' || runner.os == 'macOS' ) && matrix.action == 'compile-examples'
140140
run: |

include/wrappers/MinizipWrapper.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ namespace modio
1515
void extract(std::string zip_path, std::string directory_path);
1616
void compressDirectory(std::string directory, std::string zip_path);
1717
void compressFiles(std::string root_directory, std::vector<std::string> filenames, std::string zip_path);
18+
// Internal function used for testing only
19+
std::vector<std::string> getZipFilenames(const std::string& zip_path);
1820
}
1921
}
2022

0 commit comments

Comments
 (0)