Skip to content

Commit

Permalink
ci updates
Browse files Browse the repository at this point in the history
Signed-off-by: Ji Bin <[email protected]>
  • Loading branch information
Ji Bin authored and matrixji committed Jan 18, 2024
1 parent 98741ac commit 159092a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ RUN . /tmp/env && \
fi ; \
if id $DEV_USER 2>/dev/null 1>/dev/null ; then \
echo user $DEV_USER already exist ; \
exit 1 ; \
elif id $DEV_UID 2>/dev/null 1>/dev/null ; then \
echo user $DEV_UID already exist ; \
exit 1 ; \
else \
useradd -g $DEV_GID -u $DEV_UID -m -d $DEV_HOME -s /bin/bash $DEV_USER ; \
fi && \
echo "${DEV_USER} ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/user
if [ $DEV_UID -ne 0 ] ; then \
echo "${DEV_USER} ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/user ; \
fi
4 changes: 3 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
}
},
"mounts": [
"source=${localWorkspaceFolder}/.conan,target=/home/${localEnv:USER}/.conan,type=bind,consistency=cached"
"source=${localWorkspaceFolder}/.conan,target=/home/${localEnv:USER}/.conan,type=bind,consistency=cached",
"source=${localWorkspaceFolder}/.gitconfig,target=/home/${localEnv:USER}/.gitconfig,type=bind,consistency=cached",
"source=${localWorkspaceFolder}/.ssh,target=/home/${localEnv:USER}/.ssh,type=bind,consistency=cached"
]
}
10 changes: 5 additions & 5 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
retention-days: 5
build_macos:
name: Build Wheel - macOS
runs-on: macos-11
runs-on: macos-12
env:
CCACHE_DIR: ${{ github.workspace }}/.ccache
CCACHE_COMPILERCHECK: content
Expand Down Expand Up @@ -131,9 +131,9 @@ jobs:
cache: false
- name: Build Wheel
run: |
python3 -m pip install --user build wheel 'setuptools>64.0'
brew install coreutils
timeout 10800 python3 -m build -w -n
brew install coreutils [email protected]
python3.8 -m pip install --user build wheel 'setuptools>64.0'
timeout 10800 python3.8 -m build -w -n
- uses: actions/cache/save@v3
if: always()
with:
Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macos-11", "macos-12"]
os: ["macos-12", "macos-13"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion milvus_binary/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function build_linux_x86_64() {
function install_deps_for_macosx() {
bash milvus/scripts/install_deps.sh
# need this for cache binary
brew install md5sha1sum
brew install coreutils
}

# build for macos arm64/x86_64
Expand Down
4 changes: 2 additions & 2 deletions milvus_build_backend/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ def _get_platform():
machine_text = platform.machine().lower()
if sys.platform.lower() == 'darwin':
if machine_text == 'x86_64':
return 'macosx_10_9_x86_64'
return 'macosx_12_0_x86_64'
elif machine_text == 'arm64':
return 'macosx_11_0_arm64'
return 'macosx_12_0_arm64'
if sys.platform.lower() == 'linux':
return f'manylinux2014_{machine_text}'
if sys.platform.lower() == 'win32':
Expand Down

0 comments on commit 159092a

Please sign in to comment.