Skip to content

fix(dts): remove duplicate network wait prompt in deploy workflows #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
fujijin wants to merge 1 commit into from
Closed

fix(dts): remove duplicate network wait prompt in deploy workflows #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions include/dts-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,13 +275,8 @@ board_config() {
# set. This is made with a goal to limit global variables declaration to
# dts-environment.sh and board_config function.

# We download firmwares via network. At this point, the network connection
# must be up already.

if ! wait_for_network_connection true; then
FETCH_LOCALLY="true"
print_warning "DTS couldn't connect to the internet! Using local files instead."
fi
# board_config should not force a network check globally.
# Connection checks are handled at concrete download points in workflows.

mkdir -p "$BOARD_CONFIG_PATH"
if [ "$FETCH_LOCALLY" = "true" ]; then
Expand Down
5 changes: 5 additions & 0 deletions scripts/dasharo-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1226,6 +1226,8 @@ install_workflow() {
check_if_cpu_compatible

# Download and verify firmware:
wait_for_network_connection true

if [ "$HAVE_EC" == "true" ]; then
download_ec
verify_artifacts ec
Expand Down Expand Up @@ -1310,6 +1312,8 @@ update_workflow() {
fum_and_capsule_check
fi

wait_for_network_connection true

if [ "$HAVE_EC" == "true" ]; then
download_ec
verify_artifacts ec
Expand Down Expand Up @@ -1619,6 +1623,7 @@ restore() {
echo
echo "Searching for HCL report on cloud..."

wait_for_network_connection true
${CMD_CLOUD_LIST} $uuid
error_check "Could not download HCL report from cloud."

Expand Down