mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use isCI in run.sh

Browse Source
This commit is contained in:
DianQK 2024-04-09 21:44:50 +08:00
parent 2805aedf9f
commit 9ed6e608c9
No known key found for this signature in database
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ci/docker/run.sh
View File

@ -46,7 +46,7 @@ source "$ci_dir/shared.sh"
CACHE_DOMAIN="${CACHE_DOMAIN:-ci-caches.rust-lang.org}" CACHE_DOMAIN="${CACHE_DOMAIN:-ci-caches.rust-lang.org}"
if [ -f "$docker_dir/$image/Dockerfile" ]; then if [ -f "$docker_dir/$image/Dockerfile" ]; then
if [ "$CI" != "" ]; then if isCI; then
hash_key=/tmp/.docker-hash-key.txt hash_key=/tmp/.docker-hash-key.txt
rm -f "${hash_key}" rm -f "${hash_key}"
echo $image >> $hash_key echo $image >> $hash_key
@ -102,7 +102,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
CACHE_IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci-cache:${cksum} CACHE_IMAGE_TAG=${REGISTRY}/${REGISTRY_USERNAME}/rust-ci-cache:${cksum}
# On non-CI jobs, we don't do any caching. # On non-CI jobs, we don't do any caching.
if [[ "$CI" == "" ]]; if ! isCI;
then then
retry docker build --rm -t rust-ci -f "$dockerfile" "$context" retry docker build --rm -t rust-ci -f "$dockerfile" "$context"
# On PR CI jobs, we don't have permissions to write to the registry cache, # On PR CI jobs, we don't have permissions to write to the registry cache,
@ -289,7 +289,7 @@ else
command=(/checkout/src/ci/run.sh) command=(/checkout/src/ci/run.sh)
fi fi
if [ "$CI" != "" ]; then if isCI; then
# Get some needed information for $BASE_COMMIT # Get some needed information for $BASE_COMMIT
# #
# This command gets the last merge commit which we'll use as base to list # This command gets the last merge commit which we'll use as base to list