From 5f54a2a43ed224dacf2398ed36f8b00781cb1c8e Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 1 May 2024 14:03:49 +0200
Subject: [PATCH] wip

---
 .gitea/workflows/build-and-test.yml | 49 ++++++++++++++++++++++++-----
 .gitea/workflows/build-docs.yml     | 44 --------------------------
 2 files changed, 42 insertions(+), 51 deletions(-)
 delete mode 100644 .gitea/workflows/build-docs.yml

diff --git a/.gitea/workflows/build-and-test.yml b/.gitea/workflows/build-and-test.yml
index 518b287..afe1b1d 100644
--- a/.gitea/workflows/build-and-test.yml
+++ b/.gitea/workflows/build-and-test.yml
@@ -81,10 +81,14 @@ jobs:
         run: markdown-test-report target/test-report/test-report.json --output target/test-report/test-report.md
 
       - name: Upload test report
-        uses: actions/upload-artifact@v3
+        uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main
         with:
-          name: test-report.md
-          path: target/test-report/test-report.md
+          source: target/test-report/test-report.md
+          target: mpvipc/${{ gitea.ref_name }}/
+          username: oysteikt
+          ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+          host: microbel.pvv.ntnu.no
+          known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="
 
       - name: Install grcov
         run: cargo binstall -y grcov
@@ -107,8 +111,39 @@ jobs:
             -o ./target/coverage/html \
             target/coverage/
 
-      - name: Upload coverage report
-        uses: actions/upload-artifact@v3
+      - name: Upload test report
+        uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main
         with:
-          name: coverage
-          path: target/coverage/html
+          source: target/coverage/html/
+          target: mpvipc/${{ gitea.ref_name }}/coverage/
+          username: oysteikt
+          ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+          host: microbel.pvv.ntnu.no
+          known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="
+
+  docs:
+    runs-on: ubuntu-latest-personal
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install latest nightly toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+            toolchain: nightly
+            override: true
+
+      - name: Cache dependencies
+        uses: Swatinem/rust-cache@v2
+
+      - name: Build docs
+        run: cargo doc --all-features --document-private-items --release
+
+      - name: Transfer files
+        uses: https://git.pvv.ntnu.no/oysteikt/rsync-action@main
+        with:
+          source: target/doc/
+          target: mpvipc/${{ gitea.ref_name }}/docs/
+          username: oysteikt
+          ssh-key: ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
+          host: microbel.pvv.ntnu.no
+          known-hosts: "microbel.pvv.ntnu.no ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEq0yasKP0mH6PI6ypmuzPzMnbHELo9k+YB5yW534aKudKZS65YsHJKQ9vapOtmegrn5MQbCCgrshf+/XwZcjbM="
\ No newline at end of file
diff --git a/.gitea/workflows/build-docs.yml b/.gitea/workflows/build-docs.yml
deleted file mode 100644
index 8f27f21..0000000
--- a/.gitea/workflows/build-docs.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: "Build docs"
-on:
-  push:
-    branches:
-      - master
-jobs:
-  docs:
-    runs-on: ubuntu-latest-personal
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Install latest nightly toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-            toolchain: nightly
-            override: true
-
-      - name: Cache dependencies
-        uses: Swatinem/rust-cache@v2
-
-      - name: Build docs
-        run: cargo doc --all-features --document-private-items --release
-
-      - name: Install rsync
-        run: apt-get update && apt-get install -y rsync
-
-      - name: Install SSH key
-        run: |
-          mkdir -p ~/.ssh
-          cat <<EOF >~/.ssh/key
-          ${{ secrets.OYSTEIKT_GITEA_WEBDOCS_SSH_KEY }}
-          EOF
-          chmod 600 ~/.ssh/key
-
-      - name: Deploy docs to https://pvv.ntnu.no/~oysteikt/mpvipc/${{ gitea.ref_name }}/
-        run: |
-          rsync \
-            --archive \
-            --compress \
-            --verbose \
-            --mkpath \
-            --rsh="ssh -oBatchMode=yes -oStrictHostKeyChecking=accept-new -i ~/.ssh/key" \
-            "target/doc/" \
-            "oysteikt@microbel.pvv.ntnu.no:mpvipc/${{ gitea.ref_name }}/"
\ No newline at end of file