Skip to content

Commit 3ccced6

Browse files
authored
fix(GHA): Use Machine IP and add delay for latching (freeCodeCamp#59651)
1 parent 8c5b008 commit 3ccced6

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

.github/workflows/deploy-legacy.yml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,13 @@ jobs:
8080
UserKnownHostsFile=/dev/null
8181
StrictHostKeyChecking no" > ~/.ssh/config
8282
chmod 644 ~/.ssh/config
83-
83+
sleep 10
8484
for i in {1..3}; do
8585
TS_MACHINE_NAME=${TS_MACHINE_NAME_PREFIX}-api-${i}
86-
tailscale status | grep -q "$TS_MACHINE_NAME"
87-
ssh $TS_USERNAME@$TS_MACHINE_NAME "uptime"
86+
tailscale status | grep -q "$TS_MACHINE_NAME" || { echo "Machine not found"; exit 1; }
87+
sleep 1
88+
MACHINE_IP=$(tailscale ip -4 $TS_MACHINE_NAME)
89+
ssh $TS_USERNAME@$MACHINE_IP "uptime"
8890
done
8991
9092
- name: Deploy API
@@ -134,7 +136,8 @@ jobs:
134136
pm2 save
135137
echo -e '\nLOG:Finished deployment.'
136138
"
137-
ssh $TS_USERNAME@$TS_MACHINE_NAME "$REMOTE_SCRIPT"
139+
MACHINE_IP=$(tailscale ip -4 $TS_MACHINE_NAME)
140+
ssh $TS_USERNAME@$MACHINE_IP "$REMOTE_SCRIPT"
138141
done
139142
140143
client:
@@ -251,11 +254,13 @@ jobs:
251254
UserKnownHostsFile=/dev/null
252255
StrictHostKeyChecking no" > ~/.ssh/config
253256
chmod 644 ~/.ssh/config
254-
257+
sleep 10
255258
for i in {0..1}; do
256259
TS_MACHINE_NAME=${TS_MACHINE_NAME_PREFIX}-${{ matrix.lang-name-short }}-${i}
257-
tailscale status | grep -q "$TS_MACHINE_NAME"
258-
ssh $TS_USERNAME@$TS_MACHINE_NAME "uptime"
260+
tailscale status | grep -q "$TS_MACHINE_NAME" || { echo "Machine not found"; exit 1; }
261+
sleep 1
262+
MACHINE_IP=$(tailscale ip -4 $TS_MACHINE_NAME)
263+
ssh $TS_USERNAME@$MACHINE_IP "uptime"
259264
done
260265
261266
- name: Upload and Deploy
@@ -268,7 +273,8 @@ jobs:
268273
CLIENT_BINARIES=${{needs.setup-jobs.outputs.tgt_env_short}}-release-$CURRENT_DATE-${{ github.run_id }}
269274
270275
echo -e "\nLOG:Uploading client archive to $TS_MACHINE_NAME..."
271-
scp $CLIENT_SRC $TS_USERNAME@$TS_MACHINE_NAME:$CLIENT_DST
276+
MACHINE_IP=$(tailscale ip -4 $TS_MACHINE_NAME)
277+
scp $CLIENT_SRC $TS_USERNAME@$MACHINE_IP:$CLIENT_DST
272278
273279
REMOTE_SCRIPT="
274280
set -e
@@ -318,5 +324,5 @@ jobs:
318324
319325
echo -e '\nLOG:Finished deployment.'
320326
"
321-
ssh $TS_USERNAME@$TS_MACHINE_NAME "$REMOTE_SCRIPT"
327+
ssh $TS_USERNAME@$MACHINE_IP "$REMOTE_SCRIPT"
322328
done

0 commit comments

Comments
 (0)