From c63a2b20327df532c9c939f29b43df390d0dc8b2 Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Sun, 30 Jul 2023 17:56:32 +0200
Subject: [PATCH] push

---
 .gitlab-ci.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 60c28fd..22e503e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,8 +5,7 @@ variables:
 
 before_script:
   - rustup target add $CARGO_TARGET
-  - apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools
-  - apt update && apt install -y sqlite3 && ./test_db.sh
+  - apt-get update -qq && apt-get install -y -qq sshpass musl musl-tools sqlite3 && ./test_db.sh
 
 build:
   stage: build
@@ -33,12 +32,13 @@ deploy-staging:
     - chmod 700 ~/.ssh
     - ssh-keyscan -H $SSH_HOST > ~/.ssh/known_hosts
   script:
-    - ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rotstaging'
-    - scp target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/k004373/rowing-staging
-    - ssh $SSH_USER@$SSH_HOST 'rm /home/k004373/rowing-staging/db.sqlite && cp /home/k004373/rowing/db.sqlite /home/k004373/rowing-staging/db.sqlite && mkdir -p /home/k004373/rowing-staging/svelte/build'
+    - scp target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/k004373/rowing-staging/rot-updating
     - scp -r static $SSH_USER@$SSH_HOST:/home/k004373/rowing-staging/
     - scp -r templates $SSH_USER@$SSH_HOST:/home/k004373/rowing-staging/
     - scp -r svelte $SSH_USER@$SSH_HOST:/home/k004373/rowing-staging/
+    - ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rotstaging'
+    - ssh $SSH_USER@$SSH_HOST 'rm /home/k004373/rowing-staging/db.sqlite && cp /home/k004373/rowing/db.sqlite /home/k004373/rowing-staging/db.sqlite && mkdir -p /home/k004373/rowing-staging/svelte/build'
+    - mv  /home/k004373/rowing-staging/rot-updating /home/k004373/rowing-staging/rot
     - ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rotstaging'
   only:
     - staging 
@@ -53,12 +53,13 @@ deploy-main:
     - chmod 700 ~/.ssh
     - ssh-keyscan -H $SSH_HOST > ~/.ssh/known_hosts
   script:
-    - ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rot'
-    - scp target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/k004373/rowing
+    - scp target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/k004373/rowing/rot-updating
     - scp -r static $SSH_USER@$SSH_HOST:/home/k004373/rowing/
     - scp -r templates $SSH_USER@$SSH_HOST:/home/k004373/rowing/
     - scp -r svelte $SSH_USER@$SSH_HOST:/home/k004373/rowing/
-    - ssh $SSH_USER@$SSH_HOST 'mkdir -p /home/k004373/rowing-staging/svelte/build'
+    - ssh $SSH_USER@$SSH_HOST 'mkdir -p /home/k004373/rowing/svelte/build'
+    - ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rotstaging'
+    - mv  /home/k004373/rowing/rot-updating /home/k004373/rowing/rot
     - ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rot'
   only:
     - main