Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open up develop branch for non-stable commits. #991

Merged
merged 1 commit into from Jun 12, 2021
Merged

Conversation

Dead2
Copy link
Member

@Dead2 Dead2 commented Jun 11, 2021

Start 2.1.0 develop cycle.
Replace ZLIBNG_VERNUM with a larger one with space for more accurate information.
Replace ZLIBNG_VER_SUBREVISION with ZLIBNG_VER_MODIFIED and ZLIBNG_VER_STATUS.

@Dead2 Dead2 added the Next Devel Targeting next devel release (does not mean accepted) label Jun 11, 2021
zlib.h Outdated Show resolved Hide resolved
zlib-ng.h Show resolved Hide resolved
@codecov
Copy link

codecov bot commented Jun 11, 2021

Codecov Report

Merging #991 (06037bd) into develop (558192b) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop     #991   +/-   ##
========================================
  Coverage    76.30%   76.30%           
========================================
  Files           74       74           
  Lines         8305     8305           
  Branches      1363     1370    +7     
========================================
  Hits          6337     6337           
  Misses        1439     1439           
  Partials       529      529           
Flag Coverage Δ
macos_clang 68.37% <100.00%> (ø)
macos_gcc 67.30% <100.00%> (ø)
ubuntu_clang 69.31% <100.00%> (ø)
ubuntu_clang_debug 68.70% <100.00%> (ø)
ubuntu_clang_inflate_allow_invalid_dist 69.06% <100.00%> (ø)
ubuntu_clang_inflate_strict 69.31% <100.00%> (ø)
ubuntu_clang_mmap 69.03% <100.00%> (ø)
ubuntu_clang_msan 69.31% <100.00%> (ø)
ubuntu_clang_pigz 35.09% <ø> (-0.03%) ⬇️
ubuntu_clang_pigz_no_optim 37.77% <ø> (ø)
ubuntu_clang_pigz_no_threads 34.81% <ø> (ø)
ubuntu_gcc 68.42% <100.00%> (ø)
ubuntu_gcc_aarch64 68.68% <100.00%> (ø)
ubuntu_gcc_aarch64_compat_no_opt 67.06% <100.00%> (ø)
ubuntu_gcc_aarch64_no_acle 67.58% <100.00%> (ø)
ubuntu_gcc_aarch64_no_neon 68.08% <100.00%> (ø)
ubuntu_gcc_armhf 68.67% <100.00%> (ø)
ubuntu_gcc_armhf_compat_no_opt 67.17% <100.00%> (ø)
ubuntu_gcc_armhf_no_acle 68.83% <100.00%> (ø)
ubuntu_gcc_armhf_no_neon 69.24% <100.00%> (ø)
ubuntu_gcc_armsf 68.68% <100.00%> (ø)
ubuntu_gcc_armsf_compat_no_opt 67.17% <100.00%> (ø)
ubuntu_gcc_compat_no_opt 68.44% <100.00%> (ø)
ubuntu_gcc_mingw_i686 0.00% <0.00%> (ø)
ubuntu_gcc_mingw_x86_64 0.00% <0.00%> (ø)
ubuntu_gcc_no_avx2 68.81% <100.00%> (ø)
ubuntu_gcc_no_pclmulqdq 66.58% <100.00%> (ø)
ubuntu_gcc_no_sse2 67.82% <100.00%> (ø)
ubuntu_gcc_no_sse4 66.74% <100.00%> (ø)
ubuntu_gcc_o3 68.16% <100.00%> (ø)
ubuntu_gcc_osb 70.71% <100.00%> (ø)
ubuntu_gcc_pigz 34.93% <ø> (ø)
ubuntu_gcc_ppc 69.05% <100.00%> (ø)
ubuntu_gcc_ppc64 69.83% <100.00%> (ø)
ubuntu_gcc_ppc64le 68.42% <100.00%> (ø)
ubuntu_gcc_s390x 67.81% <100.00%> (ø)
ubuntu_gcc_sparc64 70.24% <100.00%> (ø)
win64_gcc 70.17% <100.00%> (ø)
win64_gcc_compat_no_opt 73.67% <100.00%> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
zutil.c 35.71% <ø> (ø)
test/example.c 77.15% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 558192b...06037bd. Read the comment docs.

@Dead2 Dead2 force-pushed the pre-release branch 3 times, most recently from c879335 to fd1c81c Compare June 11, 2021 21:28
Replace ZLIBNG_VERNUM with a larger one with space for more accurate information.
Replace ZLIBNG_VER_SUBREVISION with ZLIBNG_VER_MODIFIED and ZLIBNG_VER_STATUS.
@Dead2
Copy link
Member Author

Dead2 commented Jun 11, 2021

Changed example.c to always print out the zlib-ng version, as it would likely not make sense to build it against stock zlib. Fixes the issue with the new ZLIBNG_VERNUM differing in length compared to the zlib one.

@Dead2 Dead2 requested review from mtl1979 and nmoinvaz June 11, 2021 21:38
@mtl1979
Copy link
Collaborator

mtl1979 commented Jun 11, 2021

@Dead2 I was kinda waiting for you to notice that issue... I didn't have any rush as I wanted to wait for CI to finish to see if there is any new warnings...

@nmoinvaz
Copy link
Member

LGTM. I like that you have kept the version number define and went with OpenSSL format. minizip-ng also uses openSSL format.

Copy link
Collaborator

@mtl1979 mtl1979 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Dead2 Dead2 merged commit 74436cf into develop Jun 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Next Devel Targeting next devel release (does not mean accepted)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants