已合并
modify simplified key for binary_script #909
sujunwei3创建于 5月29日
modify simplified key for binary_script #909
已合并
共 2 个文件变更+2-6
| @@ -47,7 +47,7 @@ main() { | |||
| 47 | 47 | ||
| 48 | start_timestamp=$(date '+%Y-%m-%d %H:%M:%S') | 48 | start_timestamp=$(date '+%Y-%m-%d %H:%M:%S') |
| 49 | echo "[$start_timestamp] Build started: ${cmd_task}" > "$log_file" | 49 | echo "[$start_timestamp] Build started: ${cmd_task}" > "$log_file" |
| 50 | - timeout 7200 ${cmd_task} >> "$log_file" 2>&1 | 50 | + timeout --foreground 2h ${cmd_task} >> "$log_file" 2>&1 |
| 51 | compile_rc=$? | 51 | compile_rc=$? |
| 52 | set -e | 52 | set -e |
| 53 | 53 | ||
| @@ -198,11 +198,7 @@ main() { | |||
| 198 | if [ "$key_mode_default" != "" ]; then | 198 | if [ "$key_mode_default" != "" ]; then |
| 199 | key_mode=${key_mode_default} | 199 | key_mode=${key_mode_default} |
| 200 | else | 200 | else |
| 201 | - if [ "$ascendc_op_conf" != "" ]; then | 201 | + key_mode=0 |
| 202 | - key_mode=0 | ||
| 203 | - else | ||
| 204 | - key_mode="None" | ||
| 205 | - fi | ||
| 206 | fi | 202 | fi |
| 207 | 203 | ||
| 208 | if [ "$key_mode" != "None" ]; then | 204 | if [ "$key_mode" != "None" ]; then |