Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthecoder committed Jul 23, 2024
1 parent 37a5a53 commit 945dff4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@

PLUNGER_SOLO_MOVE_TIME = 0.2


def _fix_pass_step_for_buffer(
move_group: MoveGroupStep,
movers: List[NodeId],
Expand Down
6 changes: 3 additions & 3 deletions scripts/push.mk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# utilities for pushing things to robots in a reusable fashion

find_robot=$(shell yarn run -s discovery find -i 169.254)
default_ssh_key := ~/.ssh/robot_key
default_ssh_key := ~/.ssh/id_rsa
default_ssh_opts := -o stricthostkeychecking=no -o userknownhostsfile=/dev/null
version_dict=$(shell ssh $(call id-file-arg,$(2)) $(3) root@$(1) cat /etc/VERSION.json)
is-ot3=$(findstring OT-3, $(version_dict))
Expand All @@ -19,7 +19,7 @@ is-in-version=$(findstring $(firstword $(checked-ssh-version)),$(allowed-ssh-ver
# when using an OpenSSH version larger than 8.9,
# we need to add a flag to use legacy scp with SFTP protocol
scp-legacy-option-flag = $(if $(is-in-version),,-O)
# when using windows, make is running against a different openSSH than the OS.
# when using windows, make is running against a different openSSH than the OS.
# adding the -O flag to scp will fail if the openSSH on OS is less than 9.
# if openSSH on OS is 9 or more please add the -O flag to scp.
PLATFORM := $(shell uname -s)
Expand Down Expand Up @@ -80,7 +80,7 @@ ssh $(call id-file-arg,$(2)) $(3) root@$(1) \
endef

# push-systemd-unit: move a systemd unit file to the robot
#
#
# argument 1 is the host to push to
# argument 2 is the identity file to use, if any
# argument 3 is any further ssh options, quoted
Expand Down

0 comments on commit 945dff4

Please sign in to comment.