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

fix macOS ci use apple silicon #272

Merged
merged 1 commit into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions .ci/integration_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,19 @@ get_csdk_lib()
if [ ! -d "/usr/local/lib/" ];then
sudo mkdir -p /usr/local/lib
fi
local platform_arch=$(uname -p)

local suffix="so"
if [ ! -z "${macOS}" ];then # macOS
suffix="dylib"
fi
if [ ! -f "/usr/local/lib/libbcos-c-sdk.${suffix}" ];then
curl -#LO "https://github.com/FISCO-BCOS/bcos-c-sdk/releases/download/${c_sdk_version}/libbcos-c-sdk.${suffix}"
sudo cp "libbcos-c-sdk.${suffix}" /usr/local/lib/
local c_sdk_lib_name="libbcos-c-sdk.${suffix}"
if [ "${platform_arch}" == "arm" ];then
c_sdk_lib_name="libbcos-c-sdk-aarch64.${suffix}"
fi
if [ ! -f "/usr/local/lib/${c_sdk_lib_name}" ];then
curl -#LO "https://github.com/FISCO-BCOS/bcos-c-sdk/releases/download/${c_sdk_version}/${c_sdk_lib_name}"
sudo cp "${c_sdk_lib_name}" /usr/local/lib/
fi
}

Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ jobs:
- name: test all
if: ${{ runner.os == 'Linux' }}
run: bash -x .ci/integration_test.sh -a
- name: install deps
if: ${{ runner.os == 'macOS' }}
run: brew install zlib z3
- name: test without amop
if: ${{ runner.os == 'macOS' }}
run: bash .ci/integration_test.sh
Loading