Skip to content

Commit 127a0e6

Browse files
committed
fix ci error after moving run.sh to scripts dir
1 parent 30b27da commit 127a0e6

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

ci/scripts/run.sh

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ set -e
44

55
export MSYS_NO_PATHCONV=1
66

7-
script=`cd $(dirname $0) && pwd`/`basename $0`
7+
script="`realpath $0`"
8+
script_dir="`dirname $script`"
9+
ci_dir="`dirname $script_dir`"
10+
docker_dir="$ci_dir/docker"
11+
root_dir="`dirname $ci_dir`"
812

913
# 检查环境变量 IMAGE 是否存在
1014
if [ $# -eq 0 ]; then
@@ -19,14 +23,8 @@ echo "Current image: $image"
1923
# MacOS reports "arm64" while Linux reports "aarch64". Commonize this.
2024
machine="$(uname -m | sed 's/arm64/aarch64/')"
2125

22-
script_dir="`dirname $script`"
23-
docker_dir="${script_dir}/docker"
24-
ci_dir="`dirname $script_dir`"
25-
root_dir="`dirname $ci_dir`"
26-
27-
if [ -f "$docker_dir/$image/Dockerfile" ]; then
28-
dockerfile="$docker_dir/$image/Dockerfile"
29-
context="$script_dir"
26+
dockerfile="$docker_dir/$image/Dockerfile"
27+
if [ -f "$dockerfile" ]; then
3028
echo "::group::Building docker image for $image"
3129

3230
# Print docker version
@@ -38,7 +36,7 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
3836
"--rm"
3937
"-t" "rim"
4038
"-f" "$dockerfile"
41-
"$context"
39+
"$ci_dir"
4240
)
4341

4442
docker buildx "${build_args[@]}" --output=type=docker

ci/scripts/upload-release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ ENDPOINT='https://obs.cn-north-4.myhuaweicloud.com'
77

88
CACHE_DIR="`dirname $0`/cache"
99
echo "cache will be stored at: $CACHE_DIR"
10+
mkdir -p "$CACHE_DIR"
1011

1112
OS=`uname -s`
1213
ARCH=`uname -m`
@@ -71,7 +72,7 @@ download_and_install_obsutil() {
7172
local obsutil_archive_name=`basename $obsutil_url`
7273
local obsutil_archive="$CACHE_DIR/$obsutil_archive_name"
7374
echo "downloading obsutil archive from remote server"
74-
[[ -f $obsutil_archive ]] || curl -Lso $obsutil_archive $obsutil_url
75+
[[ -f "$obsutil_archive" ]] || curl -Lso $obsutil_archive $obsutil_url
7576

7677
# extract obsutil archive
7778
local obsutil_path="$CACHE_DIR/obsutil"

0 commit comments

Comments
 (0)