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.

Sign up for GitHub

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

feat: download ckb_aarch64 for neuron-arm64 #2627

Merged
merged 2 commits into from
Apr 6, 2023
Merged

feat: download ckb_aarch64 for neuron-arm64 #2627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
994fb23
feat: download ckb_aarch64 for neuron-arch64
Keith-CY Apr 4, 2023
3fb4fbb
ci: set macos-11 for packaging for test
Keith-CY Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ckb-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.107.0
v0.108.1
12 changes: 6 additions & 6 deletions .github/workflows/package_for_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,28 +97,28 @@ jobs:
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Mac
name: Neuron-Mac-x64
path: release/Neuron-*-mac-x64.zip

- name: Upload Neuron App Zip(arm64)
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Mac
name: Neuron-Mac-arm64
path: release/Neuron-*-mac-arm64.zip

- name: Upload Neuron Dmg
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Dmg
name: Neuron-Dmg-x64
path: release/Neuron-*-x64.dmg

- name: Upload Neuron Dmg(arm64)
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-11'
uses: actions/upload-artifact@v3
with:
name: Neuron-Dmg
name: Neuron-Dmg-arm64
path: release/Neuron-*-arm64.dmg

- name: Upload Neuron Win
Expand Down
2 changes: 1 addition & 1 deletion packages/neuron-wallet/electron-builder.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ mac:
category: public.app-category.finance
icon: assets/icons/icon.icns
extraFiles:
- from: "bin/mac/ckb"
- from: "bin/mac/ckb-${arch}"
to: "bin/ckb"
hardenedRuntime: true
gatekeeperAssess: false
Expand Down
30 changes: 24 additions & 6 deletions scripts/download-ckb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,33 @@

CKB_VERSION=$(cat .ckb-version)
ROOT_DIR=$(pwd) # Be sure to run this from root directory!
GITHUB_RELEASE_URL="https://github.com/nervosnetwork/ckb/releases/download"

function download_macos() {
# macOS
CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-apple-darwin-portable"
download_macos_x86_64
download_macos_aarch64
}

function download_macos_x86_64() {
# for macOS x64
CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-apple-darwin"
cd $ROOT_DIR/packages/neuron-wallet/bin/mac

curl -O -L "https://github.com/nervosnetwork/ckb/releases/download/${CKB_VERSION}/${CKB_FILENAME}.zip"
curl -O -L "${GITHUB_RELEASE_URL}/${CKB_VERSION}/${CKB_FILENAME}.zip"
unzip ${CKB_FILENAME}.zip
cp ${CKB_FILENAME}/ckb ./
cp ${CKB_FILENAME}/ckb ./ckb-x64
rm -rf $CKB_FILENAME
rm ${CKB_FILENAME}.zip
}

function download_macos_aarch64() {
# for macOS arm64
CKB_FILENAME="ckb_${CKB_VERSION}_aarch64-apple-darwin"
cd $ROOT_DIR/packages/neuron-wallet/bin/mac

curl -O -L "${GITHUB_RELEASE_URL}/${CKB_VERSION}/${CKB_FILENAME}.zip"
unzip ${CKB_FILENAME}.zip
cp ${CKB_FILENAME}/ckb ./ckb-arm64
rm -rf $CKB_FILENAME
rm ${CKB_FILENAME}.zip
}
Expand All @@ -20,7 +38,7 @@ function download_linux() {
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"
curl -O -L "${GITHUB_RELEASE_URL}/${CKB_VERSION}/${CKB_FILENAME}.tar.gz"
tar xvzf ${CKB_FILENAME}.tar.gz
cp ${CKB_FILENAME}/ckb ./
rm -rf $CKB_FILENAME
Expand All @@ -32,7 +50,7 @@ function download_windows() {
CKB_FILENAME="ckb_${CKB_VERSION}_x86_64-pc-windows-msvc"
cd $ROOT_DIR/packages/neuron-wallet/bin/win

curl -O -L "https://github.com/nervosnetwork/ckb/releases/download/${CKB_VERSION}/${CKB_FILENAME}.zip"
curl -O -L "${GITHUB_RELEASE_URL}/${CKB_VERSION}/${CKB_FILENAME}.zip"
unzip ${CKB_FILENAME}.zip
cp ${CKB_FILENAME}/ckb.exe ./
rm -rf $CKB_FILENAME
Expand Down