enhance: [skip e2e]conan lock issue (#29442)

not allow to upload cache when job failure

this PR is to fix issue like below:

openblas/0.3.23@milvus/dev is locked by another concurrent conan
process, wait... If not the case, quit, and do 'conan remove --locks'
Error: The operation was canceled.

Signed-off-by: Sammy Huang <sammy.huang@zilliz.com>
pull/29443/head
sammy.huang 2023-12-25 16:34:46 +08:00 committed by GitHub
parent 62fdfe125f
commit 3e5bc2e517
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions

View File

@ -57,7 +57,7 @@ jobs:
echo "corehash=${CORE_HASH}" >> $GITHUB_ENV
echo "Set CCache hash to ${CORE_HASH}"
- name: Cache CCache Volumes
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-ubuntu20.04-ccache
key: ubuntu20.04-ccache-${{ env.corehash }}
@ -69,7 +69,7 @@ jobs:
key: ubuntu20.04-go-mod-${{ hashFiles('go.sum, */go.sum') }}
restore-keys: ubuntu20.04-go-mod-
- name: Cache Conan Packages
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-ubuntu20.04-conan
key: ubuntu20.04-conan-${{ hashFiles('internal/core/conanfile.*') }}
@ -105,7 +105,7 @@ jobs:
echo "corehash=${CORE_HASH}" >> $GITHUB_ENV
echo "Set CCache hash to ${CORE_HASH}"
- name: Cache CCache Volumes
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-amazonlinux2023-ccache
key: amazonlinux2023-ccache-${{ env.corehash }}
@ -123,7 +123,7 @@ jobs:
key: amazonlinux2023-go-mod-${{ hashFiles('go.sum, */go.sum') }}
restore-keys: amazonlinux2023-go-mod-
- name: Cache Conan Packages
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-amazonlinux2023-conan
key: amazonlinux2023-conan-${{ hashFiles('internal/core/conanfile.*') }}

View File

@ -43,7 +43,7 @@ jobs:
echo "corehash=${CORE_HASH}" >> $GITHUB_ENV
echo "Set CCache hash to ${CORE_HASH}"
- name: Mac Cache CCache Volumes
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: /var/tmp/ccache
key: macos-ccache-${{ env.corehash }}
@ -63,7 +63,7 @@ jobs:
key: macos-go-mod-${{ hashFiles('**/go.sum') }}
restore-keys: macos-go-mod-
- name: Mac Cache Conan Packages
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: ~/.conan
key: macos-conan-${{ hashFiles('internal/core/conanfile.*') }}

View File

@ -93,13 +93,13 @@ jobs:
echo "Set CCache hash to ${CORE_HASH}"
- name: Cache CCache Volumes
# uses: actions/cache@v3
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-ubuntu${{ matrix.ubuntu }}-ccache
key: ubuntu${{ matrix.ubuntu }}-ccache-${{ env.corehash }}
restore-keys: ubuntu${{ matrix.ubuntu }}-ccache-
- name: Cache Conan Packages
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-ubuntu${{ matrix.ubuntu }}-conan
key: ubuntu${{ matrix.ubuntu }}-conan-${{ hashFiles('internal/core/conanfile.*') }}
@ -134,7 +134,7 @@ jobs:
unzip code.zip
rm code.zip
- name: Cache Conan Packages
uses: pat-s/always-upload-cache@v3
uses: actions/cache@v3
with:
path: .docker/amd64-ubuntu${{ matrix.ubuntu }}-conan
key: ubuntu${{ matrix.ubuntu }}-conan-${{ hashFiles('internal/core/conanfile.*') }}