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

zlib: Update ci and Makefile using a different link #820

Merged
merged 12 commits into from
Jan 28, 2024
5 changes: 1 addition & 4 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,7 @@ jobs:
shell: powershell
run: |
cd $Env:THIRDPARTY_HOME
curl https://zlib.net/zlib13.zip -o zlib13.zip
Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp
mv .\zlib-tmp\zlib-1.3\ .
rmdir zlib-tmp
git clone https://github.com/madler/zlib.git -b v1.3 zlib-1.3
cd zlib-1.3\contrib\vstudio\vc14
devenv zlibvc.sln /upgrade
cp ../../../zlib.h .
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/ci_pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,7 @@ jobs:
shell: powershell
run: |
cd $Env:THIRDPARTY_HOME
curl https://zlib.net/zlib13.zip -o zlib13.zip
Expand-Archive -Path zlib13.zip -DestinationPath zlib-tmp
mv .\zlib-tmp\zlib-1.3\ .
rmdir zlib-tmp
git clone https://github.com/madler/zlib.git -b v1.3 zlib-1.3
cd zlib-1.3\contrib\vstudio\vc14
devenv zlibvc.sln /upgrade
cp ../../../zlib.h .
Expand Down
1 change: 1 addition & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ RocksDB has a value of 10 by default and we've added the option to randomize the
* Remove leftover references to ROCKSDB_LITE (#755).
* Options: Set compaction_readahead_size default to 0. The current default of 2Mb is not optimal for most of our use cases. Having a value of 0 means that the FS will use its default size for prefetching (true only with https://github.com/speedb-io/speedb/pull/788).
* Options: Set level_compaction_dynamic_level_bytes as false by default. This flag is not working properly with Speedb. see https://github.com/speedb-io/speedb/issues/786 for more details.
* zlib: Update links to zlib 1.3 in CI and Makefile since the link in zlib.net is dead.

## Hazlenut 2.7.0 (27/10/2023)
Based on RocksDB 8.1.1
Expand Down
16 changes: 15 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Copyright (C) 2023 Speedb Ltd. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

Yuval-Ariel marked this conversation as resolved.
Show resolved Hide resolved
# Copyright (c) 2011 The LevelDB Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. See the AUTHORS file for names of contributors.
Expand Down Expand Up @@ -2003,7 +2017,7 @@ SHA256_CMD = sha256sum

ZLIB_VER ?= 1.3
ZLIB_SHA256 ?= ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
ZLIB_DOWNLOAD_BASE ?= http://zlib.net
ZLIB_DOWNLOAD_BASE ?= https://github.com/madler/zlib/releases/download/v1.3
BZIP2_VER ?= 1.0.8
BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
BZIP2_DOWNLOAD_BASE ?= http://sourceware.org/pub/bzip2
Expand Down
Loading