forked from Ruderverein-Donau-Linz/rowt
Compare commits
5 Commits
bdf92f40f0
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 9890a4ac09 | |||
| b60834ca18 | |||
| f8b16b2a95 | |||
| 39e1c4432a | |||
| c548bf211b |
@@ -63,53 +63,14 @@ jobs:
|
|||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
||||||
chmod 600 ~/.ssh/id_rsa
|
chmod 600 ~/.ssh/id_rsa
|
||||||
|
|
||||||
scp -C target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/wolfgangsee/rot-updating
|
scp -C target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/root/rowing-wolfgangsee/rot-updating
|
||||||
scp -C -r static $SSH_USER@$SSH_HOST:/home/wolfgangsee/
|
scp -C -r static $SSH_USER@$SSH_HOST:/root/rowing-wolfgangsee/
|
||||||
scp -C -r templates $SSH_USER@$SSH_HOST:/home/wolfgangsee/
|
scp -C -r templates $SSH_USER@$SSH_HOST:/root/rowing-wolfgangsee/
|
||||||
scp -C -r svelte $SSH_USER@$SSH_HOST:/home/wolfgangsee/
|
scp -C -r svelte $SSH_USER@$SSH_HOST:/root/rowing-wolfgangsee/
|
||||||
ssh $SSH_USER@$SSH_HOST 'mkdir -p /home/wolfgangsee/svelte/build'
|
ssh $SSH_USER@$SSH_HOST 'mkdir -p /root/rowing-wolfgangsee/svelte/build'
|
||||||
ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop wolfgangsee'
|
ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop rowing-wolfgangsee'
|
||||||
ssh $SSH_USER@$SSH_HOST 'mv /home/wolfgangsee/rot-updating /home/wolfgangsee/rot'
|
ssh $SSH_USER@$SSH_HOST 'mv /root/rowing-wolfgangsee/rot-updating /root/rowing-wolfgangsee/rot'
|
||||||
ssh $SSH_USER@$SSH_HOST 'sudo systemctl start wolfgangsee'
|
ssh $SSH_USER@$SSH_HOST 'sudo systemctl start rowing-wolfgangsee'
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
|
||||||
SSH_USER: ${{ secrets.SSH_USER }}
|
|
||||||
- name: Deploy Normannen
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
ssh-keyscan -H $SSH_HOST >> ~/.ssh/known_hosts
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
|
|
||||||
scp -C target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/normannen/rot-updating
|
|
||||||
scp -C -r static $SSH_USER@$SSH_HOST:/home/normannen/
|
|
||||||
scp -C -r templates $SSH_USER@$SSH_HOST:/home/normannen/
|
|
||||||
scp -C -r svelte $SSH_USER@$SSH_HOST:/home/normannen/
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'mkdir -p /home/normannen/svelte/build'
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop normannen'
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'mv /home/normannen/rot-updating /home/normannen/rot'
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'sudo systemctl start normannen'
|
|
||||||
env:
|
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
|
||||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
|
||||||
SSH_USER: ${{ secrets.SSH_USER }}
|
|
||||||
|
|
||||||
- name: Deploy Ister
|
|
||||||
run: |
|
|
||||||
mkdir -p ~/.ssh
|
|
||||||
ssh-keyscan -H $SSH_HOST >> ~/.ssh/known_hosts
|
|
||||||
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
|
||||||
chmod 600 ~/.ssh/id_rsa
|
|
||||||
|
|
||||||
scp -C target/$CARGO_TARGET/release/rot $SSH_USER@$SSH_HOST:/home/ister/rot-updating
|
|
||||||
scp -C -r static $SSH_USER@$SSH_HOST:/home/ister/
|
|
||||||
scp -C -r templates $SSH_USER@$SSH_HOST:/home/ister/
|
|
||||||
scp -C -r svelte $SSH_USER@$SSH_HOST:/home/ister/
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'mkdir -p /home/ister/svelte/build'
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'sudo systemctl stop ister'
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'mv /home/ister/rot-updating /home/ister/rot'
|
|
||||||
ssh $SSH_USER@$SSH_HOST 'sudo systemctl start ister'
|
|
||||||
env:
|
env:
|
||||||
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||||
SSH_HOST: ${{ secrets.SSH_HOST }}
|
SSH_HOST: ${{ secrets.SSH_HOST }}
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ test.describe("cox can edit trips", () => {
|
|||||||
await sharedPage.getByPlaceholder("Passwort").fill("rower");
|
await sharedPage.getByPlaceholder("Passwort").fill("rower");
|
||||||
await sharedPage.getByPlaceholder("Passwort").press("Enter");
|
await sharedPage.getByPlaceholder("Passwort").press("Enter");
|
||||||
|
|
||||||
await sharedPage.goto("/planned");
|
await sharedPage.goto("/");
|
||||||
await sharedPage.getByRole('link', { name: 'Mitrudern' }).nth(1).click();
|
await sharedPage.getByRole('link', { name: 'Mitrudern' }).nth(1).click();
|
||||||
|
|
||||||
|
|
||||||
@@ -142,7 +142,7 @@ test.describe("cox can edit trips", () => {
|
|||||||
await sharedPage.getByPlaceholder("Passwort").fill("cox");
|
await sharedPage.getByPlaceholder("Passwort").fill("cox");
|
||||||
await sharedPage.getByPlaceholder("Passwort").press("Enter");
|
await sharedPage.getByPlaceholder("Passwort").press("Enter");
|
||||||
|
|
||||||
await sharedPage.goto("/planned");
|
await sharedPage.goto("/");
|
||||||
|
|
||||||
|
|
||||||
// ... now I can cancel trip
|
// ... now I can cancel trip
|
||||||
@@ -171,7 +171,7 @@ test.describe("cox can edit trips", () => {
|
|||||||
await sharedPage.getByPlaceholder("Passwort").fill("rower");
|
await sharedPage.getByPlaceholder("Passwort").fill("rower");
|
||||||
await sharedPage.getByPlaceholder("Passwort").press("Enter");
|
await sharedPage.getByPlaceholder("Passwort").press("Enter");
|
||||||
|
|
||||||
await sharedPage.goto("/planned");
|
await sharedPage.goto("/");
|
||||||
await sharedPage.getByRole('link', { name: 'Abmelden' }).click();
|
await sharedPage.getByRole('link', { name: 'Abmelden' }).click();
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ use sqlx::{FromRow, Row, SqlitePool};
|
|||||||
use super::{
|
use super::{
|
||||||
log::Log,
|
log::Log,
|
||||||
notification::Notification,
|
notification::Notification,
|
||||||
role::Role,
|
|
||||||
tripdetails::TripDetails,
|
tripdetails::TripDetails,
|
||||||
triptype::TripType,
|
triptype::TripType,
|
||||||
user::{EventUser, User},
|
user::{EventUser, User},
|
||||||
|
|||||||
Reference in New Issue
Block a user