Merge branch 'master' into develop

EthanYuan · Sep 13, 2023 · 1681c27 · 1681c27
2 parents 9cb5c18 + 4012680
commit 1681c27
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/.github/workflows/package.yaml b/.github/workflows/package.yaml
@@ -78,7 +78,7 @@ jobs:
         name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
         path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
     env:
-      BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.71.1
+      BUILDER_IMAGE: nervos/ckb-docker-builder:bionic-rust-1.67.1
       REL_PKG: ${{ matrix.rel_pkg }}
 
   package-for-linux-aarch64:
@@ -112,10 +112,10 @@ jobs:
         cd ..
         export OPENSSL_LIB_DIR=${TOP_DIR}/openssl-1.1.1
         export OPENSSL_INCLUDE_DIR=${TOP_DIR}/openssl-1.1.1/include
-        PKG_CONFIG_ALLOW_CROSS=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc cargo build --target=aarch64-unknown-linux-gnu --release --features portable
+        PKG_CONFIG_ALLOW_CROSS=1 CC=gcc CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc CKB_BUILD_TARGET="--target=aarch64-unknown-linux-gnu" make prod_portable
         gpg --quiet --batch --yes --decrypt --passphrase="$LARGE_SECRET_PASSPHRASE" --output devtools/ci/signer.asc devtools/ci/signer.asc.gpg
         gpg --import devtools/ci/signer.asc
-        devtools/ci/package.sh target/aarch64-unknown-linux-gnu/release/ckb
+        devtools/ci/package.sh target/aarch64-unknown-linux-gnu/prod/ckb
         mv ${{ github.workspace }}/releases/ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }} ${{ github.workspace }}
         mv ${{ github.workspace }}/releases/ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc ${{ github.workspace }}
     - name: upload-zip-file
@@ -170,7 +170,7 @@ jobs:
         name: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
         path: ckb_${{env.GIT_TAG_NAME }}_${{env.REL_PKG }}.asc
     env:
-      BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.71.1
+      BUILDER_IMAGE: nervos/ckb-docker-builder:centos-7-rust-1.67.1
       REL_PKG: ${{ matrix.rel_pkg }}
 
   package-for-mac:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# [v0.110.2](https://github.com/nervosnetwork/ckb/compare/v0.110.1...v0.110.2) (2023-09-11)
+
+### Features
+
+-   #4126: Notify dummy miner for new work (@quake)
+
+### Bug Fixes
+
+-   #4133: Keep peer store address unique (@driftluo)
+
 # [v0.110.1](https://github.com/nervosnetwork/ckb/compare/v0.110.0...v0.110.1) (2023-08-20)
 
 BREAKING: Light Client Protocol Softfork Activation in Mainnet
@@ -12,6 +22,7 @@ BREAKING: Light Client Protocol Softfork Activation in Mainnet
 # [v0.110.0](https://github.com/nervosnetwork/ckb/compare/v0.109.0...v0.110.0) (2023-05-15)
 
 ### Features
+
 * #3949 **rpc: (BREAKING)** Add `time_added_to_pool` field for `ChainRpcImpl::get_transaction` (@eval-exec)
 
 ### Bug Fixes