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

Fixed directory delimiter in zip-files #150

Merged
merged 14 commits into from
Jun 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand All @@ -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: |
Expand All @@ -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: |
Expand Down
2 changes: 2 additions & 0 deletions include/wrappers/MinizipWrapper.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
Loading