File tree 6 files changed +32
-17
lines changed
6 files changed +32
-17
lines changed Original file line number Diff line number Diff line change @@ -46,11 +46,12 @@ function convert_image() {
46
46
47
47
local source_image=" $1 "
48
48
local dpi_config=" $2 "
49
-
49
+ local destination_image
50
+
50
51
if (( $# >= 3 )) ; then
51
- local destination_image=" $3 "
52
+ destination_image=" $3 "
52
53
else
53
- local destination_image=" $( basename " $source_image " .svg | sed -e ' s/-/_/g' ) "
54
+ destination_image=" $( basename " $source_image " .svg | sed -e ' s/-/_/g' ) "
54
55
fi
55
56
56
57
if (( $# >= 4 )) ; then
@@ -59,8 +60,10 @@ function convert_image() {
59
60
local destination_dir=" drawable"
60
61
fi
61
62
62
- local dpi=" $( echo " $dpi_config " | cut -f1 -d' -' ) "
63
- local size=" $( echo " $dpi_config " | cut -f2 -d' -' ) "
63
+ local dpi
64
+ dpi=" $( echo " $dpi_config " | cut -f1 -d' -' ) "
65
+ local size
66
+ size=" $( echo " $dpi_config " | cut -f2 -d' -' ) "
64
67
65
68
local dpi_dir=" ../lib/resource/src/main/res/${destination_dir} -${dpi} "
66
69
Original file line number Diff line number Diff line change @@ -92,7 +92,8 @@ function run_build_loop() {
92
92
run_git tag | xargs git tag -d > /dev/null
93
93
94
94
run_git fetch --prune --tags 2> /dev/null || continue
95
- local tags=( $( run_git tag | grep " $TAG_PATTERN_TO_BUILD " ) )
95
+ local tags
96
+ tags=( $( run_git tag | grep " $TAG_PATTERN_TO_BUILD " ) )
96
97
97
98
for tag in " ${tags[@]} " ; do
98
99
build_ref " refs/tags/$tag "
Original file line number Diff line number Diff line change 2
2
set -eu
3
3
shopt -s nullglob
4
4
5
- readonly SCRIPT_DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
5
+ SCRIPT_DIR=" $( cd " $( dirname " ${BASH_SOURCE[0]} " ) " && pwd ) "
6
+ readonly SCRIPT_DIR
6
7
readonly REPO_DIR=" $SCRIPT_DIR /.."
7
8
8
9
# In the CI environment we would like to import trusted public keys from a file,
Original file line number Diff line number Diff line change @@ -65,7 +65,8 @@ install_mobile_provisioning() {
65
65
fi
66
66
67
67
for mobile_provisioning_path in " $IOS_PROVISIONING_PROFILES_DIR " /* .mobileprovision; do
68
- local profile_uuid=$( get_mobile_provisioning_uuid " $mobile_provisioning_path " )
68
+ local profile_uuid
69
+ profile_uuid=$( get_mobile_provisioning_uuid " $mobile_provisioning_path " )
69
70
local target_path=" $SYSTEM_PROVISIONING_PROFILES_DIR /$profile_uuid .mobileprovision"
70
71
71
72
if [[ -f " $target_path " ]]; then
Original file line number Diff line number Diff line change @@ -122,7 +122,8 @@ function download_app_package {
122
122
package_repo=" ${BUILD_RELEASE_REPOSITORY} "
123
123
fi
124
124
125
- local filename=$( get_app_filename " $version " " $os " )
125
+ local filename
126
+ filename=$( get_app_filename " $version " " $os " )
126
127
local url=" ${package_repo} /$version /$filename "
127
128
128
129
mkdir -p " $PACKAGES_DIR "
@@ -170,7 +171,8 @@ function download_e2e_executable {
170
171
package_repo=" ${BUILD_RELEASE_REPOSITORY} "
171
172
fi
172
173
173
- local filename=$( get_e2e_filename " $version " " $os " )
174
+ local filename
175
+ filename=$( get_e2e_filename " $version " " $os " )
174
176
local url=" ${package_repo} /$version /additional-files/$filename "
175
177
176
178
mkdir -p " $PACKAGES_DIR "
@@ -185,8 +187,10 @@ function download_e2e_executable {
185
187
function run_tests_for_os {
186
188
local os=$1
187
189
188
- local prev_filename=$( get_app_filename " $OLD_APP_VERSION " " $os " )
189
- local cur_filename=$( get_app_filename " $NEW_APP_VERSION " " $os " )
190
+ local prev_filename
191
+ prev_filename=$( get_app_filename " $OLD_APP_VERSION " " $os " )
192
+ local cur_filename
193
+ cur_filename=$( get_app_filename " $NEW_APP_VERSION " " $os " )
190
194
191
195
rm -f " $SCRIPT_DIR /.ci-logs/${os} _report"
192
196
Original file line number Diff line number Diff line change @@ -27,12 +27,15 @@ function is_docker_build {
27
27
}
28
28
29
29
function unix_target_triple {
30
- local platform=" $( uname -s) "
30
+ local platform
31
+ platform=" $( uname -s) "
31
32
if [[ (" ${platform} " == " Linux" ) ]]; then
32
- local arch=" $( uname -m) "
33
+ local arch
34
+ arch=" $( uname -m) "
33
35
echo " ${arch} -unknown-linux-gnu"
34
36
elif [[ (" ${platform} " == " Darwin" ) ]]; then
35
- local arch=" $( uname -m) "
37
+ local arch
38
+ arch=" $( uname -m) "
36
39
if [[ (" ${arch} " == " arm64" ) ]]; then
37
40
arch=" aarch64"
38
41
fi
@@ -68,7 +71,8 @@ function build_unix {
68
71
export GOARCH=arm64
69
72
fi
70
73
71
- export CC=" $( xcrun -sdk " $SDKROOT " --find clang) -arch $arch -isysroot $SDKROOT "
74
+ CC=" $( xcrun -sdk " $SDKROOT " --find clang) -arch $arch -isysroot $SDKROOT "
75
+ export CC
72
76
export CFLAGS=" -isysroot $SDKROOT -arch $arch -I$SDKROOT /usr/include"
73
77
export LD_LIBRARY_PATH=" $SDKROOT /usr/lib"
74
78
export CGO_CFLAGS=" -isysroot $SDKROOT -arch $arch "
@@ -100,7 +104,8 @@ function build_wireguard_go {
100
104
return
101
105
fi
102
106
103
- local platform=" $( uname -s) " ;
107
+ local platform
108
+ platform=" $( uname -s) " ;
104
109
case " $platform " in
105
110
Linux* |Darwin* ) build_unix " ${1:- $(unix_target_triple)} " ;;
106
111
* )
You can’t perform that action at this time.
0 commit comments