Skip to content

Commit b0f10cb

Browse files
committed
ci: Debug
1 parent 6ab4180 commit b0f10cb

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

docker/linux.sh

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ function print_help() {
136136
esac
137137
}
138138

139-
function build_container() {
140-
log_group_begin "Building image $image_name"
139+
function build_image() {
140+
log_group_begin "Build image $image_name"
141141

142142
ndk_version=$(cat ndk-version.txt)
143143
dock build -t $image_name --build-arg NDK_VERSION=$ndk_version - < docker/Dockerfile.linux
@@ -171,9 +171,10 @@ function gradle_cache_rsync() {
171171
local dst=$3
172172

173173
exe mkdir -p "${gradle_cache_dirs[@]/#/$src/}"
174-
exe flock $lock_mode /mnt/cache/gradle.lock \
174+
exe flock $lock_mode --verbose /mnt/cache/gradle.lock \
175175
rsync \
176-
-a \
176+
-avh \
177+
--delete \
177178
--exclude='*.lock' \
178179
${gradle_cache_dirs[@]/*/--include=/&/ --include=/&/***} \
179180
--exclude='*' \
@@ -196,7 +197,7 @@ function start_container() {
196197
if [ -z "$commit" -a -z "$srcdir" ]; then error "Missing one of --commit or --srcdir"; fi
197198
if [ -n "$commit" -a -n "$srcdir" ]; then error "--commit and --src are mutually exclusive"; fi
198199

199-
build_container
200+
build_image
200201

201202
if [ "$cache" = 1 ]; then
202203
create_cache_volume
@@ -335,7 +336,7 @@ function manage_container() {
335336
stop_container
336337
;;
337338
build)
338-
build_container
339+
build_image
339340
;;
340341
esac
341342
}
@@ -547,8 +548,8 @@ function integration_test_android() {
547548
emulator_start --api $api
548549

549550
log_group_begin "Run tests"
550-
exe -w /opt/ouisync-app -t flutter \
551-
test integration_test --flavor itest --ignore-timeouts $@
551+
exe -w /opt/ouisync-app -t \
552+
flutter test integration_test --flavor itest --ignore-timeouts --verbose $@
552553
log_group_end
553554

554555
emulator_stop

0 commit comments

Comments
 (0)