From 26fdd1d7cc50e7dc86dab9bc02310e57d2631a28 Mon Sep 17 00:00:00 2001
From: Alexey Palazhchenko <alexey.palazhchenko@gmail.com>
Date: Mon, 23 Dec 2024 15:42:04 +0400
Subject: [PATCH] Tweak Tailscale setup

---
 .github/workflows/dance.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/dance.yml b/.github/workflows/dance.yml
index a23d8bd8..68b8e05a 100644
--- a/.github/workflows/dance.yml
+++ b/.github/workflows/dance.yml
@@ -65,6 +65,15 @@ jobs:
           - ycsb-workloadc
 
     steps:
+      - name: Install Tailscale
+        if: github.event_name != 'pull_request'
+        uses: tailscale/github-action@v3
+        with:
+          oauth-client-id: ${{ secrets.TAILSCALE_CLIENT_ID }}
+          oauth-secret: ${{ secrets.TAILSCALE_SECRET }}
+          tags: tag:ci
+          version: latest
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:
@@ -85,22 +94,13 @@ jobs:
           FERRETDB_IMAGE: ${{ inputs.ferretdb_image || 'ghcr.io/ferretdb/ferretdb-dev:main' }}
           POSTGRES_IMAGE: ${{ inputs.postgres_image || 'postgres:16.4' }}
 
-      - name: Install Tailscale
-        if: github.event_name != 'pull_request'
-        uses: tailscale/github-action@v3
-        with:
-          oauth-client-id: ${{ secrets.TAILSCALE_CLIENT_ID }}
-          oauth-secret: ${{ secrets.TAILSCALE_SECRET }}
-          tags: tag:ci
-          version: latest
-
-      - name: Ping Tailscale in the background
-        if: github.event_name != 'pull_request'
-        run: tailscale ping -c 0 --timeout 1s ${{ secrets.DANCE_PUSH_HOST }} &
-
       - name: Run init
         run: bin/task init build
 
+      - name: Wait for Tailscale to be up
+        if: github.event_name != 'pull_request'
+        run: tailscale ping -c 0 --until-direct --timeout 1s --verbose ${{ secrets.DANCE_PUSH_HOST }}
+
       - name: Dance!
         run: bin/task dance CONFIG=${{ matrix.project }}.yml
         env:
@@ -109,6 +109,7 @@ jobs:
       - name: Collect logs
         if: failure()
         run: |
+          mkdir -p /tmp/logs
           bin/task env-logs-collect > /tmp/logs/compose.txt
 
       - name: Compress logs before upload