From e4007d9fd7ba510f8cb228b44c850472a4a90937 Mon Sep 17 00:00:00 2001
From: Ji Bin <matrixji@ive.com>
Date: Wed, 17 Jan 2024 04:47:19 +0000
Subject: [PATCH] ci updates

Signed-off-by: Ji Bin <matrixji@ive.com>
---
 .devcontainer/Dockerfile        | 6 +++---
 .devcontainer/devcontainer.json | 4 +++-
 .github/workflows/main.yml      | 8 ++++----
 milvus_binary/build.sh          | 2 +-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index de9139b..df691cc 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -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
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index acaf8d6..44119f2 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -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"
     ]
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0ec05d6..5a3be8e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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
@@ -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 python@3.8
+          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:
diff --git a/milvus_binary/build.sh b/milvus_binary/build.sh
index 9573c20..a85f03b 100644
--- a/milvus_binary/build.sh
+++ b/milvus_binary/build.sh
@@ -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