use rsync instead of scp (#337)

quic-interop · Dec 29, 2023 · ec3200c · ec3200c
1 parent fb67a94
commit ec3200c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 26 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: appleboy/scp-action@master
+      - name: Upload website to interop.seemann.io
+        uses: burnett01/rsync-deployments@c04732dab25a8b2c000b7198a067bf26e93959e2 # v6.0.0
         with:
-          host: interop.seemann.io
-          username: ${{ secrets.INTEROP_SEEMANN_IO_USER }}
-          key: ${{ secrets.INTEROP_SEEMANN_IO_SSH_KEY }}
-          source: web/
-          target: ${{ secrets.INTEROP_SEEMANN_IO_WEBSITE_DIR }}
-          rm: true
-          strip_components: 1
+          switches: -avzr --delete
+          path: web/
+          remote_path: ${{ secrets.INTEROP_SEEMANN_IO_WEBSITE_DIR }}
+          remote_host: interop.seemann.io
+          remote_user: ${{ secrets.INTEROP_SEEMANN_IO_USER }}
+          remote_key: ${{ secrets.INTEROP_SEEMANN_IO_SSH_KEY }}
       - name: Restart server
-        uses: appleboy/ssh-action@master
+        uses: appleboy/ssh-action@8f949198563a347a01c65ffc60399aef2b59d4ab # v1.0.1
         with:
           host: interop.seemann.io
           username: ${{ secrets.INTEROP_SEEMANN_IO_USER }}

diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml
@@ -222,16 +222,16 @@ jobs:
           find logs_measurement -depth -name "client" -type d -exec rm -r "{}" \;
           find logs_measurement -depth -name "server" -type d -exec rm -r "{}" \;
           mv logs_measurement/${{ matrix.server }}_${{ matrix.client }}/* logs/${{ matrix.server }}_${{ matrix.client }}/
-      - name: Upload logs
+      - name: Upload logs to interop.seemann.io
+        uses: burnett01/rsync-deployments@c04732dab25a8b2c000b7198a067bf26e93959e2 # v6.0.0
         if: ${{ github.event_name == 'schedule' }}
-        uses: appleboy/scp-action@master
         with:
-          host: interop.seemann.io
-          username: ${{ secrets.INTEROP_SEEMANN_IO_USER }}
-          key: ${{ secrets.INTEROP_SEEMANN_IO_SSH_KEY }}
-          source: logs/${{ matrix.server }}_${{ matrix.client }}
-          target: /mnt/logs/${{ needs.config.outputs.logname }}
-          strip_components: 1
+          switches: -avzr
+          path: logs/${{ matrix.server }}_${{ matrix.client }}/
+          remote_path: /mnt/logs/${{ needs.config.outputs.logname }}/
+          remote_host: interop.seemann.io
+          remote_user: ${{ secrets.INTEROP_SEEMANN_IO_USER }}
+          remote_key: ${{ secrets.INTEROP_SEEMANN_IO_SSH_KEY }}
       - name: Upload result
         uses: actions/upload-artifact@v3
         with:
@@ -269,18 +269,19 @@ jobs:
         with:
           name: results
           path: result.json
-      - name: Upload result to interop.seemann.io
+      - name: Upload logs to interop.seemann.io
+        uses: burnett01/rsync-deployments@c04732dab25a8b2c000b7198a067bf26e93959e2 # v6.0.0
         if: ${{ github.event_name == 'schedule' }}
-        uses: appleboy/scp-action@master
         with:
-          host: interop.seemann.io
-          username: ${{ secrets.INTEROP_SEEMANN_IO_USER }}
-          key: ${{ secrets.INTEROP_SEEMANN_IO_SSH_KEY }}
-          source: result.json
-          target: /mnt/logs/${{ needs.config.outputs.logname }}
-      - name: Publish result
+          switches: -avzr
+          path: result.json
+          remote_path: /mnt/logs/${{ needs.config.outputs.logname }}/ # rrsync configuration points this to the correct path
+          remote_host: interop.seemann.io
+          remote_user: ${{ secrets.INTEROP_SEEMANN_IO_USER }}
+          remote_key: ${{ secrets.INTEROP_SEEMANN_IO_SSH_KEY }}
+      - name: Point interop.seemann.io to the latest result 
+        uses: appleboy/ssh-action@8f949198563a347a01c65ffc60399aef2b59d4ab # v1.0.1
         if: ${{ github.event_name == 'schedule' }}
-        uses: appleboy/ssh-action@master
         with:
           host: interop.seemann.io
           username: ${{ secrets.INTEROP_SEEMANN_IO_USER }}