mirror of
https://github.com/zlib-ng/minizip-ng
synced 2025-03-28 21:13:18 +00:00
Disable MZ_SIGNING due to extra test requirements.
MZ_SIGNING no longer on by default due to extra test requirements of having to have a certificate installed as root to validate signing.
This commit is contained in:
parent
4d13283bad
commit
60649ada97
44
.github/workflows/build.yml
vendored
44
.github/workflows/build.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
||||
os: ubuntu-18.04
|
||||
compiler: gcc
|
||||
cxx-compiler: g++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON
|
||||
version: "4.8"
|
||||
codecov: ubuntu_18_gcc_48
|
||||
|
||||
@ -20,14 +20,14 @@ jobs:
|
||||
os: ubuntu-18.04
|
||||
compiler: gcc
|
||||
cxx-compiler: g++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON
|
||||
codecov: ubuntu_18_gcc
|
||||
|
||||
- name: Ubuntu 18 Clang 3.9
|
||||
os: ubuntu-18.04
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON
|
||||
codecov: ubuntu_18_clang_39
|
||||
version: "3.7"
|
||||
packages: llvm-3.9
|
||||
@ -45,7 +45,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: gcc
|
||||
cxx-compiler: g++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON
|
||||
codecov: ubuntu_gcc
|
||||
|
||||
- name: Ubuntu GCC OSB
|
||||
@ -54,14 +54,14 @@ jobs:
|
||||
cxx-compiler: g++
|
||||
build-dir: ../build
|
||||
build-src-dir: ../minizip-ng
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON
|
||||
codecov: ubuntu_gcc_osb
|
||||
|
||||
- name: Ubuntu Clang
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON
|
||||
codecov: ubuntu_clang
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -70,7 +70,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_ZLIB=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_ZLIB=OFF
|
||||
codecov: ubuntu_clang_no_zlib
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -79,7 +79,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_BZIP=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_BZIP=OFF
|
||||
codecov: ubuntu_clang_no_bzip2
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -88,7 +88,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_LZMA=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_LZMA=OFF
|
||||
codecov: ubuntu_clang_no_lzma
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -97,7 +97,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_ZSTD=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_ZSTD=OFF
|
||||
codecov: ubuntu_clang_no_zstd
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -106,7 +106,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_PKCRYPT=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_PKCRYPT=OFF
|
||||
codecov: ubuntu_clang_no_pkcrypt
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -115,7 +115,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_WZAES=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_WZAES=OFF
|
||||
codecov: ubuntu_clang_no_winzip_aes
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -124,7 +124,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_PKCRYPT=OFF -DMZ_WZAES=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_PKCRYPT=OFF -DMZ_WZAES=OFF
|
||||
codecov: ubuntu_clang_no_encryption
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -133,7 +133,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_COMPRESS_ONLY=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_COMPRESS_ONLY=ON
|
||||
codecov: ubuntu_clang_compress_only
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -142,7 +142,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_DECOMPRESS_ONLY=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_DECOMPRESS_ONLY=ON
|
||||
codecov: ubuntu_clang_decompress_only
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -151,7 +151,7 @@ jobs:
|
||||
os: ubuntu-latest
|
||||
compiler: clang
|
||||
cxx-compiler: clang++
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_OPENSSL=ON
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_OPENSSL=ON
|
||||
codecov: ubuntu_clang_openssl
|
||||
packages: llvm-6.0
|
||||
gcov-exec: llvm-cov-6.0 gcov
|
||||
@ -161,7 +161,7 @@ jobs:
|
||||
os: windows-latest
|
||||
compiler: cl
|
||||
# Don't use find_package for 3rd party libraries which are installed incorrectly on GitHub CI instances
|
||||
cmake-args: -DMZ_FORCE_FETCH_LIBS=ON
|
||||
cmake-args: -DMZ_FORCE_FETCH_LIBS=ON -DMZ_SIGNING=ON
|
||||
deploy: true
|
||||
deploy-name: windows
|
||||
|
||||
@ -170,30 +170,30 @@ jobs:
|
||||
compiler: gcc
|
||||
cxx-compiler: g++
|
||||
# Don't use find_package for 3rd party libraries which are installed incorrectly on GitHub CI instances
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_FORCE_FETCH_LIBS=ON -G Ninja
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_FORCE_FETCH_LIBS=ON -G Ninja
|
||||
codecov: windows_gcc
|
||||
|
||||
# No code coverage on release builds
|
||||
- name: macOS Xcode 9.4.1
|
||||
os: macOS-latest
|
||||
version: "9.4.1"
|
||||
cmake-args: -DMZ_BUILD_UNIT_TESTS=OFF
|
||||
cmake-args: -DMZ_BUILD_UNIT_TESTS=OFF -DMZ_SIGNING=ON
|
||||
deploy: true
|
||||
deploy-name: macos
|
||||
|
||||
- name: macOS Xcode
|
||||
os: macOS-latest
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON
|
||||
codecov: macos_xcode
|
||||
|
||||
- name: macOS Xcode LibCompression
|
||||
os: macOS-latest
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_LIBCOMP=ON -DMZ_SIGNING=OFF
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_LIBCOMP=ON
|
||||
codecov: macos_xcode_libcompression
|
||||
|
||||
- name: macOS Xcode OpenSSL
|
||||
os: macOS-latest
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_OPENSSL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIRS=/usr/local/opt/openssl/include -DOPENSSL_CRYPTO_LIBRARY=/usr/local/opt/openssl/lib/libcrypto.dylib -DOPENSSL_SSL_LIBRARY=/usr/local/opt/openssl/lib/libssl.dylib
|
||||
cmake-args: -DMZ_CODE_COVERAGE=ON -DMZ_SIGNING=ON -DMZ_OPENSSL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIRS=/usr/local/opt/openssl/include -DOPENSSL_CRYPTO_LIBRARY=/usr/local/opt/openssl/lib/libcrypto.dylib -DOPENSSL_SSL_LIBRARY=/usr/local/opt/openssl/lib/libssl.dylib
|
||||
codecov: macos_xcode_openssl
|
||||
|
||||
steps:
|
||||
|
@ -26,7 +26,7 @@ option(MZ_PKCRYPT "Enables PKWARE traditional encryption" ON)
|
||||
option(MZ_WZAES "Enables WinZIP AES encryption" ON)
|
||||
option(MZ_OPENSSL "Enables OpenSSL for encryption" ${UNIX})
|
||||
option(MZ_LIBBSD "Enable libbsd crypto random" ${UNIX})
|
||||
option(MZ_SIGNING "Enables zip signing support" ON)
|
||||
option(MZ_SIGNING "Enables zip signing support" OFF)
|
||||
# Character conversion options
|
||||
option(MZ_ICONV "Enables iconv for string encoding conversion" ON)
|
||||
# Code generation options
|
||||
|
@ -79,7 +79,7 @@ cmake --build .
|
||||
| MZ_WZAES | Enables WinZIP AES encryption | ON |
|
||||
| MZ_OPENSSL | Enables OpenSSL encryption | UNIX |
|
||||
| MZ_LIBBSD | Builds with libbsd crypto random | UNIX |
|
||||
| MZ_SIGNING | Enables zip signing support | ON |
|
||||
| MZ_SIGNING | Enables zip signing support | OFF |
|
||||
| MZ_ICONV | Enables iconv encoding conversion | ON |
|
||||
| MZ_COMPRESS_ONLY | Only support compression | OFF |
|
||||
| MZ_DECOMPRESS_ONLY | Only support decompression | OFF |
|
||||
|
Loading…
x
Reference in New Issue
Block a user