Finalize 1.99.8.0.0 release #444

Open
RElesgoe wants to merge 326 commits from develop into master
RElesgoe commented 2021-03-03 08:05:07 -07:00 (Migrated from github.com)
No description provided.
aperture147 commented 2021-09-01 16:17:48 -06:00 (Migrated from github.com)

It's 5 months now :( is this pull request still being active?

It's 5 months now :( is this pull request still being active?
onlyjob commented 2021-09-14 03:17:11 -06:00 (Migrated from github.com)

Please do not commit common third party libraries like zlib, which is already shipped by all major GNU+Linux distributions.

See also https://wiki.debian.org/UpstreamGuide specifically "No inclusion of third party code" section (but not limited to). Thanks.

Please do not commit common third party libraries like _zlib_, which is already shipped by all major GNU+Linux distributions. See also https://wiki.debian.org/UpstreamGuide specifically "No inclusion of third party code" section (but not limited to). Thanks.
RElesgoe commented 2021-09-16 19:45:25 -06:00 (Migrated from github.com)

Please do not commit common third party libraries like zlib, which is already shipped by all major GNU+Linux distributions.

See also https://wiki.debian.org/UpstreamGuide specifically "No inclusion of third party code" section (but not limited to). Thanks.

These libraries were committed to facilitate easier compilation on Windows platforms where easy to use package managers do not exist.

Though, now that I'm checking the CMake code, I see that the condition for including the committed zlib is not guarded by the WIN32 variable (https://github.com/pvpgn/pvpgn-server/blob/develop/ConfigureChecks.cmake#L52-L55). This will need to be changed before merging this pull request.

> Please do not commit common third party libraries like _zlib_, which is already shipped by all major GNU+Linux distributions. > > See also https://wiki.debian.org/UpstreamGuide specifically "No inclusion of third party code" section (but not limited to). Thanks. These libraries were committed to facilitate easier compilation on Windows platforms where easy to use package managers do not exist. Though, now that I'm checking the CMake code, I see that the condition for including the committed zlib is not guarded by the `WIN32` variable (https://github.com/pvpgn/pvpgn-server/blob/develop/ConfigureChecks.cmake#L52-L55). This will need to be changed before merging this pull request.
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin develop:develop
git checkout develop

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff develop
git checkout develop
git rebase master
git checkout master
git merge --ff-only develop
git checkout develop
git rebase master
git checkout master
git merge --no-ff develop
git checkout master
git merge --squash develop
git checkout master
git merge --ff-only develop
git checkout master
git merge develop
git push origin master
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Techwizz/pvpgn-server#444
No description provided.