fix: Fix ckb node on M1 (#2483)

nervosnetwork · Sep 9, 2022 · d360cad · d360cad · github-actions · Sep 9, 2022
1 parent d949773
commit d360cad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/.ckb-version b/.ckb-version
@@ -1 +1 @@
-v0.104.0
+v0.104.1
diff --git a/packages/neuron-wallet/tests/services/monitor.test.ts b/packages/neuron-wallet/tests/services/monitor.test.ts
@@ -119,38 +119,38 @@ describe('base monitor', () => {
     })
     it('not living', async () => {
       isLivingMock.mockResolvedValue(true).mockResolvedValueOnce(false)
-      monitor.startMonitor(100)
+      await monitor.startMonitor(100)
       await wait(200)
       expect(isLivingMock).toHaveBeenCalled()
       expect(restartMock).toHaveBeenCalled()
     })
     it('isLiving timeout', async () => {
       isLivingMock.mockImplementation(() => wait(200))
-      monitor.startMonitor(100)
+      await monitor.startMonitor(100)
       await wait(200)
       expect(isLivingMock).toHaveBeenCalled()
       expect(restartMock).toHaveBeenCalledTimes(1)
     })
     it('not living wait restart', async () => {
       isLivingMock.mockResolvedValue(true).mockResolvedValueOnce(false)
       restartMock.mockImplementation(() => wait(400))
-      monitor.startMonitor(100)
+      await monitor.startMonitor(100)
       await wait(800)
       expect(isLivingMock).toHaveBeenCalled()
       expect(restartMock).toHaveBeenCalledTimes(1)
     })
     it('start monitor with first', async () => {
       isLivingMock.mockResolvedValue(true).mockResolvedValueOnce(false)
-      monitor.startMonitor(1000, true)
+      await monitor.startMonitor(1000, true)
       await wait(500)
       expect(isLivingMock).toHaveBeenCalled()
       expect(restartMock).toHaveBeenCalled()
     })
     it('twice start monitor', async () => {
       isLivingMock.mockReset()
       isLivingMock.mockResolvedValue(true)
-      monitor.startMonitor(500)
-      monitor.startMonitor(500)
+      await monitor.startMonitor(500)
+      await monitor.startMonitor(500)
       await wait(800)
       expect(isLivingMock).toHaveBeenCalledTimes(1)
     })

diff --git a/scripts/download-ckb.sh b/scripts/download-ckb.sh
@@ -86,7 +86,7 @@ function download_mercury_windows() {
 
 function download_macos() {
   # macOS
-  CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-apple-darwin"
+  CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-apple-darwin-portable"
   cd $ROOT_DIR/packages/neuron-wallet/bin/mac
 
   curl -O -L "https://github.com/nervosnetwork/ckb/releases/download/${CKB_VERSION}/${CKB_FILENAME}.zip"
@@ -101,7 +101,7 @@ function download_macos() {
 
 function download_linux() {
   # Linux
-  CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-unknown-linux-gnu"
+  CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-unknown-linux-gnu-portable"
   cd $ROOT_DIR/packages/neuron-wallet/bin/linux
 
   curl -O -L "https://github.com/nervosnetwork/ckb/releases/download/${CKB_VERSION}/${CKB_FILENAME}.tar.gz"