From 6f5af282da7ab681c8a7f4389d4a51d12540bf92 Mon Sep 17 00:00:00 2001
From: Xyon <xyon@orbiter-radio.uk>
Date: Sat, 12 Oct 2024 13:53:18 +0100
Subject: [PATCH] Revert deploy changes to previous base and rethink life
 choices

---
 .gitea/workflows/deploy.yaml | 34 +++++-----------------------------
 Cargo.lock                   |  5 +++--
 cicd/deploy.sh               | 12 +++++-------
 3 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index 8aebb49..2d483a3 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -9,47 +9,23 @@ jobs:
   build:
     runs-on: rust
     container:
-      image: xyonofcalhoun/manifold:latest
+      options: --dns 172.16.255.254
     env:
       GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Pre-seed known_hosts (Badgey)
+      - name: Pre-seed known_hosts
         run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa badgey >> ~/.ssh/known_hosts
-      - name: Pre-seed known_hosts (M5)
-        run: mkdir -pv ~/.ssh && ssh-keyscan -t rsa m5-computer >> ~/.ssh/known_hosts
       - name: Build (Release)
         run: cargo build --release --color=always
-      - name: Archive artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: badgey
-          path: target/release/badgey
-  deploy:
-    runs-on: rust
-    container:
-      options: --dns 172.16.255.254
-    strategy:
-      matrix:
-        bot: [ BADGEY, M5_COMPUTER ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: badgey
-      - name: Seed config file
-        uses: cschleiden/replace-tokens@v1.2
+      - uses: cschleiden/replace-tokens@v1.2
         with:
           files: config/production.badgey.json
         env:
-          BOT_NICKNAME: ${{ vars[format('{0}_BOT_NICKNAME', matrix.bot) }}
-          LOG_CHANNEL_ID: ${{ vars[format('{0}_LOG_CHANNEL_ID', matrix.bot) }}
           POSTGRES_HOST: ${{ vars.POSTGRES_HOST }}
           POSTGRES_USER: ${{ vars.POSTGRES_USER }}
-          POSTGRES_DATABASE_NAME: ${{ vars[format('{0}_POSTGRES_DATABASE_NAME', matrix.bot) }}
+          POSTGRES_DATABASE_NAME: ${{ vars.POSTGRES_DATABASE_NAME }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}
           WEATHER_API_KEY: ${{ secrets.WEATHER_API_KEY }}
           DOGPICS_API_KEY: ${{ secrets.DOGPICS_API_KEY }}
@@ -57,4 +33,4 @@ jobs:
       - name: Seed SSH key for deploy
         run: echo "${{ secrets.DEPLOY_KEY }}" | tr -d '\r' > ~/.ssh/id_rsa && chmod 0600 ~/.ssh/id_rsa
       - name: Deploy
-        run: bash cicd/deploy.sh ${{ matrix.bot }}
+        run: bash cicd/deploy.sh
diff --git a/Cargo.lock b/Cargo.lock
index a8d1628..206176b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -172,7 +172,7 @@ dependencies = [
 
 [[package]]
 name = "badgey"
-version = "4.0.0"
+version = "4.1.0"
 dependencies = [
  "built",
  "clap",
@@ -1268,7 +1268,8 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "manifold"
-version = "6.0.0"
+version = "6.1.0"
+source = "git+https://code.orbiter-radio.uk/discord/manifold.git#4e60cef97ab6395afb139ee24f9240237593d032"
 dependencies = [
  "built",
  "chrono",
diff --git a/cicd/deploy.sh b/cicd/deploy.sh
index 6553460..680bf12 100755
--- a/cicd/deploy.sh
+++ b/cicd/deploy.sh
@@ -1,9 +1,7 @@
 #!/bin/bash
 
-bot=$(echo "$1" | tr '[:upper:]' '[:lower:]')
-
-ssh $bot@$bot sudo /usr/bin/systemctl stop $bot
-rsync -avP badgey $bot@$bot:/srv/$bot/
-rsync -avP config $bot@$bot:/srv/$bot/
-rsync -avP txt $bot@$bot:/srv/$bot/
-ssh $bot@$bot sudo /usr/bin/systemctl start $bot
\ No newline at end of file
+ssh badgey@badgey sudo /usr/bin/systemctl stop badgey
+rsync -avP target/release/badgey badgey@badgey:/srv/badgey/
+rsync -avP config badgey@badgey:/srv/badgey/
+rsync -avP txt badgey@badgey:/srv/badgey/
+ssh badgey@badgey sudo /usr/bin/systemctl start badgey
\ No newline at end of file