From e83f601bd87d0d14d3a086f49b80a1fa04dee3d5 Mon Sep 17 00:00:00 2001 From: leiyanfei Date: Thu, 16 Nov 2023 12:34:33 +0800 Subject: [PATCH] Update zlib version --- .circleci/config.yml | 145 ++++++++++++++++++++++--------------------- Makefile | 4 +- 2 files changed, 77 insertions(+), 72 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c614d3f0e..c863236e5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -68,7 +68,7 @@ commands: command: | mkdir build cd build - & $Env:CMAKE_BIN -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 .. + & $Env:CMAKE_BIN -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=RELEASE -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DJNI=1 .. cd .. echo "Building with VS version: $Env:CMAKE_GENERATOR" msbuild.exe build/rocksdb.sln -maxCpuCount -property:Configuration=Debug -property:Platform=x64 @@ -77,6 +77,8 @@ commands: shell: powershell.exe command: | build_tools\run_ci_db_test.ps1 -SuiteRun arena_test,db_basic_test,db_test,db_test2,db_merge_operand_test,bloom_test,c_test,coding_test,crc32c_test,dynamic_bloom_test,env_basic_test,env_test,hash_test,random_test -Concurrency 16 + - store_artifacts: + path: build\java pre-steps-macos: steps: - pre-steps @@ -544,7 +546,7 @@ jobs: build-windows-vs2022: executor: name: win/server-2022 - size: 2xlarge + size: xlarge environment: THIRDPARTY_HOME: C:/Users/circleci/thirdparty CMAKE_HOME: C:/Program Files/CMake @@ -589,8 +591,9 @@ jobs: - post-steps build-linux-java-static: - executor: linux-docker - resource_class: large + machine: + image: ubuntu-2004:202111-02 + resource_class: arm.xlarge steps: - pre-steps - run: @@ -602,7 +605,9 @@ jobs: which javac && javac -version - run: name: "Build RocksDBJava Static Library" - command: make V=1 J=8 -j8 rocksdbjavastatic + command: DEBUG_LEVEL=0 ROCKSDB_DISABLE_JEMALLOC=true PORTABLE=1 CXXFLAGS="-Wno-error=shadow -Wno-error-defaulted-function-deleted -Wno-unknown-warning-option " make V=1 J=8 -j8 rocksdbjavastaticdockerarm64v8musl + - store_artifacts: + path: java/target - post-steps build-macos-java: @@ -807,74 +812,74 @@ jobs: workflows: version: 2 - jobs-linux-run-tests: - jobs: - - build-linux - - build-linux-cmake-with-folly - - build-linux-cmake-with-folly-lite-no-test - - build-linux-gcc-7-with-folly - - build-linux-gcc-7-with-folly-lite-no-test - - build-linux-cmake-with-folly-coroutines - - build-linux-cmake-with-benchmark - - build-linux-encrypted_env-no_compression - jobs-linux-run-tests-san: - jobs: - - build-linux-clang10-asan - - build-linux-clang10-ubsan - - build-linux-clang10-mini-tsan - - build-linux-static_lib-alt_namespace-status_checked - jobs-linux-no-test-run: - jobs: - - build-linux-release - - build-linux-release-rtti - - build-examples - - build-fuzzers - - build-linux-clang-no_test_run - - build-linux-clang-13-no_test_run - - build-linux-gcc-8-no_test_run - - build-linux-gcc-10-cxx20-no_test_run - - build-linux-gcc-11-no_test_run - - build-linux-arm-cmake-no_test_run - jobs-linux-other-checks: - jobs: - - build-linux-clang10-clang-analyze - - build-linux-unity-and-headers - - build-linux-mini-crashtest +# jobs-linux-run-tests: +# jobs: +# - build-linux +# - build-linux-cmake-with-folly +# - build-linux-cmake-with-folly-lite-no-test +# - build-linux-gcc-7-with-folly +# - build-linux-gcc-7-with-folly-lite-no-test +# - build-linux-cmake-with-folly-coroutines +# - build-linux-cmake-with-benchmark +# - build-linux-encrypted_env-no_compression +# jobs-linux-run-tests-san: +# jobs: +# - build-linux-clang10-asan +# - build-linux-clang10-ubsan +# - build-linux-clang10-mini-tsan +# - build-linux-static_lib-alt_namespace-status_checked +# jobs-linux-no-test-run: +# jobs: +# - build-linux-release +# - build-linux-release-rtti +# - build-examples +# - build-fuzzers +# - build-linux-clang-no_test_run +# - build-linux-clang-13-no_test_run +# - build-linux-gcc-8-no_test_run +# - build-linux-gcc-10-cxx20-no_test_run +# - build-linux-gcc-11-no_test_run +# - build-linux-arm-cmake-no_test_run +# jobs-linux-other-checks: +# jobs: +# - build-linux-clang10-clang-analyze +# - build-linux-unity-and-headers +# - build-linux-mini-crashtest jobs-windows: jobs: - build-windows-vs2022 - - build-windows-vs2019 - - build-cmake-mingw - jobs-java: - jobs: - - build-linux-java - - build-linux-java-static - - build-macos-java - - build-macos-java-static - - build-macos-java-static-universal - jobs-macos: - jobs: - - build-macos - - build-macos-cmake: - run_even_tests: true - - build-macos-cmake: - run_even_tests: false - jobs-linux-arm: - jobs: - - build-linux-arm - build-fuzzers: - jobs: - - build-fuzzers - benchmark-linux: - triggers: - - schedule: - cron: "0 * * * *" - filters: - branches: - only: - - main - jobs: - - benchmark-linux +# - build-windows-vs2019 +# - build-cmake-mingw +# jobs-java: +# jobs: +# - build-linux-java +# - build-linux-java-static +# - build-macos-java +# - build-macos-java-static +# - build-macos-java-static-universal +# jobs-macos: +# jobs: +# - build-macos +# - build-macos-cmake: +# run_even_tests: true +# - build-macos-cmake: +# run_even_tests: false +# jobs-linux-arm: +# jobs: +# - build-linux-arm +# build-fuzzers: +# jobs: +# - build-fuzzers +# benchmark-linux: +# triggers: +# - schedule: +# cron: "0 * * * *" +# filters: +# branches: +# only: +# - main +# jobs: +# - benchmark-linux nightly: triggers: - schedule: diff --git a/Makefile b/Makefile index 2425982bf..dd3295c2d 100644 --- a/Makefile +++ b/Makefile @@ -2091,8 +2091,8 @@ ROCKSDB_JAVADOCS_JAR = rocksdbjni-$(ROCKSDB_JAVA_VERSION)-javadoc.jar ROCKSDB_SOURCES_JAR = rocksdbjni-$(ROCKSDB_JAVA_VERSION)-sources.jar SHA256_CMD = sha256sum -ZLIB_VER ?= 1.2.13 -ZLIB_SHA256 ?= b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 +ZLIB_VER ?= 1.3 +ZLIB_SHA256 ?= ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e ZLIB_DOWNLOAD_BASE ?= http://zlib.net BZIP2_VER ?= 1.0.8 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269