Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
shaoting-huang committed Sep 12, 2024
2 parents c9b40ce + da227ff commit ebd75a5
Show file tree
Hide file tree
Showing 1,360 changed files with 78,452 additions and 31,085 deletions.
8 changes: 4 additions & 4 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ IMAGE_ARCH=amd64
OS_NAME=ubuntu22.04

# for services.builder.image in docker-compose.yml
DATE_VERSION=20240620-5be9929
LATEST_DATE_VERSION=20240620-5be9929
DATE_VERSION=20240816-1275005
LATEST_DATE_VERSION=20240816-1275005
# for services.gpubuilder.image in docker-compose.yml
GPU_DATE_VERSION=20240520-c35eaaa
LATEST_GPU_DATE_VERSION=20240520-c35eaaa
GPU_DATE_VERSION=20240806-d8668fe
LATEST_GPU_DATE_VERSION=20240806-d8668fe

# for other services in docker-compose.yml
MINIO_ADDRESS=minio:9000
Expand Down
7 changes: 0 additions & 7 deletions .github/actions/cache-save/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,6 @@ inputs:
runs:
using: "composite"
steps:
- name: Generate CCache Hash
env:
CORE_HASH: ${{ hashFiles( 'internal/core/**/*.cpp', 'internal/core/**/*.cc', 'internal/core/**/*.c', 'internal/core/**/*.h', 'internal/core/**/*.hpp', 'internal/core/**/CMakeLists.txt') }}
run: |
echo "corehash=${CORE_HASH}" >> $GITHUB_ENV
echo "Set CCache hash to ${CORE_HASH}"
shell: bash
- name: Cache CCache Volumes
if: ${{ inputs.kind == 'all' || inputs.kind == 'cpp' }}
uses: actions/cache/save@v4
Expand Down
30 changes: 30 additions & 0 deletions .github/actions/macos-cache-restore/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: 'Milvus Cache'
description: ''
runs:
using: "composite"
steps:
- name: 'Generate CCache Hash'
env:
CORE_HASH: ${{ hashFiles( 'internal/core/**/*.cpp', 'internal/core/**/*.cc', 'internal/core/**/*.c', 'internal/core/**/*.h', 'internal/core/**/*.hpp', 'internal/core/**/CMakeLists.txt') }}
run: |
echo "corehash=${CORE_HASH}" >> $GITHUB_ENV
echo "Set CCache hash to ${CORE_HASH}"
shell: bash
- name: Mac Cache CCache Volumes
uses: actions/cache/restore@v4
with:
path: /var/tmp/ccache
key: macos-ccache-${{ env.corehash }}
restore-keys: macos-ccache-
- name: Mac Cache Go Mod Volumes
uses: actions/cache/restore@v4
with:
path: ~/go/pkg/mod
key: macos-go-mod-${{ hashFiles('**/go.sum') }}
restore-keys: macos-go-mod-
- name: Mac Cache Conan Packages
uses: actions/cache/restore@v4
with:
path: ~/.conan
key: macos-conan-${{ hashFiles('internal/core/conanfile.*') }}
restore-keys: macos-conan-
40 changes: 40 additions & 0 deletions .github/actions/macos-cache-save/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: 'Milvus Cache'
description: ''
inputs:
os:
description: 'OS name'
required: true
default: 'ubuntu20.04'
kind:
description: 'Cache kind'
required: false
default: 'all'
runs:
using: "composite"
steps:
- name: Generate CCache Hash
env:
CORE_HASH: ${{ hashFiles( 'internal/core/**/*.cpp', 'internal/core/**/*.cc', 'internal/core/**/*.c', 'internal/core/**/*.h', 'internal/core/**/*.hpp', 'internal/core/**/CMakeLists.txt') }}
run: |
echo "corehash=${CORE_HASH}" >> $GITHUB_ENV
echo "Set CCache hash to ${CORE_HASH}"
shell: bash
- name: Mac Cache CCache Volumes
uses: actions/cache/save@v4
with:
path: /var/tmp/ccache
key: macos-ccache-${{ env.corehash }}
restore-keys: macos-ccache-
- name: Mac Cache Go Mod Volumes
uses: actions/cache/save@v4
with:
path: ~/go/pkg/mod
key: macos-go-mod-${{ hashFiles('**/go.sum') }}
restore-keys: macos-go-mod-
- name: Mac Cache Conan Packages
uses: actions/cache/save@v4
with:
path: ~/.conan
key: macos-conan-${{ hashFiles('internal/core/conanfile.*') }}
restore-keys: macos-conan-

Loading

0 comments on commit ebd75a5

Please sign in to comment.